Module Name: src
Committed By: martin
Date: Tue Aug 1 15:46:26 UTC 2023
Modified Files:
src/distrib/sets/lists/comp [netbsd-9]: mi
src/external/bsd/libarchive/lib/libarchive [netbsd-9]: Makefile
src/external/public-domain/xz/lib [netbsd-9]: Makefile
Added Files:
src/external/bsd/libarchive/lib/libarchive [netbsd-9]: libarchive.pc.in
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1693):
external/public-domain/xz/lib/Makefile: revision 1.11
external/bsd/libarchive/lib/libarchive/libarchive.pc.in: revision 1.1
distrib/sets/lists/comp/mi: revision 1.2417 (patch)
external/bsd/libarchive/lib/libarchive/Makefile: revision 1.14
Build and install pkgconfig files for liblzma and libarchive
To generate a diff of this commit:
cvs rdiff -u -r1.2278.2.5 -r1.2278.2.6 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 \
src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r0 -r1.1.4.2 \
src/external/bsd/libarchive/lib/libarchive/libarchive.pc.in
cvs rdiff -u -r1.10 -r1.10.2.1 src/external/public-domain/xz/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2278.2.5 src/distrib/sets/lists/comp/mi:1.2278.2.6
--- src/distrib/sets/lists/comp/mi:1.2278.2.5 Sun Dec 8 14:26:38 2019
+++ src/distrib/sets/lists/comp/mi Tue Aug 1 15:46:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2278.2.5 2019/12/08 14:26:38 martin Exp $
+# $NetBSD: mi,v 1.2278.2.6 2023/08/01 15:46:25 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3862,7 +3862,9 @@
./usr/lib/pkgconfig/atf.pc comp-obsolete obsolete
./usr/lib/pkgconfig/expat.pc comp-c-lib
./usr/lib/pkgconfig/kyua-testers.pc comp-kyua-lib kyua,share
+./usr/lib/pkgconfig/libarchive.pc comp-c-lib share
./usr/lib/pkgconfig/libcrypto.pc comp-crypto-lib share
+./usr/lib/pkgconfig/liblzma.pc comp-c-lib share
./usr/lib/pkgconfig/libssl.pc comp-crypto-lib share
./usr/lib/pkgconfig/lutok.pc comp-crypto-lib kyua,share
./usr/lib/pkgconfig/openssl.pc comp-crypto-lib share
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.10.2.1 src/external/bsd/libarchive/lib/libarchive/Makefile:1.10.2.2
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.10.2.1 Tue Jan 21 15:48:52 2020
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Tue Aug 1 15:46:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10.2.1 2020/01/21 15:48:52 martin Exp $
+# $NetBSD: Makefile,v 1.10.2.2 2023/08/01 15:46:25 martin Exp $
.include <bsd.init.mk>
@@ -458,4 +458,21 @@ COPTS.archive_read_support_format_mtree.
COPTS.target.c+= ${GCC_NO_STRINGOP_TRUNCATION}
COPTS.archive_write_set_format_iso9660.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+FILES+= libarchive.pc
+FILESOWN_libarchive.pc= ${BINOWN}
+FILESGRP_libarchive.pc= ${BINGRP}
+FILESMODE_libarchive.pc= ${NONBINMODE}
+FILESDIR_libarchive.pc= /usr/lib/pkgconfig
+
+CLEANFILES+=libarchive.pc
+
.include <bsd.lib.mk>
+
+all: libarchive.pc
+dependall: all
+
+libarchive.pc: archive.h libarchive.pc.in
+ @(V=$$( (echo '#include <archive.h>'; echo ARCHIVE_VERSION_ONLY_STRING) | \
+ ${CC} ${CPPFLAGS} -E -I${.CURDIR} - | tail -1 | tr -d '"') && \
+ ${TOOL_SED} -e s/@VERSION@/$$V/ < ${.CURDIR}/libarchive.pc.in \
+ > ${.TARGET})
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.10 src/external/public-domain/xz/lib/Makefile:1.10.2.1
--- src/external/public-domain/xz/lib/Makefile:1.10 Tue Sep 25 05:42:08 2018
+++ src/external/public-domain/xz/lib/Makefile Tue Aug 1 15:46:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/09/25 05:42:08 joerg Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2023/08/01 15:46:25 martin Exp $
.include <bsd.init.mk>
@@ -80,6 +80,9 @@ SRCS+= price_table.c
SRCS+= simple_coder.c simple_encoder.c simple_decoder.c \
arm.c armthumb.c ia64.c powerpc.c sparc.c x86.c
+FILES+= liblzma.pc
+FILESDIR_liblzma.pc= /usr/lib/pkgconfig
+
liblzma.pc: ${XZSRCDIR}/src/liblzma/liblzma.pc.in
${_MKTARGET_CREATE}
rm -f ${.TARGET}
@@ -88,9 +91,9 @@ liblzma.pc: ${XZSRCDIR}/src/liblzma/libl
-e 's,@exec_prefix@,/usr,' \
-e 's,@libdir@,/usr/lib,' \
-e 's,@includedir@,/usr/include,' \
- -e 's,@PACKAGE_HOMEPAGE@,${XZHOMEPAGE:Q},' \
+ -e 's,@PACKAGE_URL@,${XZHOMEPAGE:Q},' \
-e 's,@PACKAGE_VERSION@,${XZVERSION:Q},' \
- -e 's,@PTHREAD_CFLAGS@ @PTHREAD_LIBS@,-lpthread,' \
+ -e 's,@PTHREAD_CFLAGS@ @LIBS@,-lpthread,' \
< ${XZSRCDIR}/src/liblzma/liblzma.pc.in \
> ${.TARGET}.tmp && \
mv -f ${.TARGET}.tmp ${.TARGET}
@@ -109,3 +112,5 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/
.include <bsd.lib.mk>
.endif
+all: liblzma.pc
+dependall: all
Added files:
Index: src/external/bsd/libarchive/lib/libarchive/libarchive.pc.in
diff -u /dev/null src/external/bsd/libarchive/lib/libarchive/libarchive.pc.in:1.1.4.2
--- /dev/null Tue Aug 1 15:46:26 2023
+++ src/external/bsd/libarchive/lib/libarchive/libarchive.pc.in Tue Aug 1 15:46:25 2023
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libarchive
+Description: library that can create and read several streaming archive formats
+Version: @VERSION@
+Cflags: -I${includedir}
+Cflags.private: -DLIBARCHIVE_STATIC
+Libs: -L${libdir} -larchive
+Libs.private: -llzma -lbz2 -lz
