[src/trunk]: src Build and install pkgconfig files for liblzma and libarchive

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/578dd47a0949
branches:  trunk
changeset: 368618:578dd47a0949
user:      wiz <wiz%NetBSD.org@localhost>
date:      Fri Jul 22 15:43:36 2022 +0000

description:
Build and install pkgconfig files for liblzma and libarchive

diffstat:

 distrib/sets/lists/comp/mi                              |   4 ++-
 external/bsd/libarchive/lib/libarchive/Makefile         |  19 ++++++++++++++++-
 external/bsd/libarchive/lib/libarchive/libarchive.pc.in |  12 ++++++++++
 external/public-domain/xz/lib/Makefile                  |  11 +++++++--
 4 files changed, 41 insertions(+), 5 deletions(-)

diffs (104 lines):

diff -r e881484db663 -r 578dd47a0949 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Fri Jul 22 12:30:56 2022 +0000
+++ b/distrib/sets/lists/comp/mi        Fri Jul 22 15:43:36 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2416 2022/06/06 10:56:27 nia Exp $
+#      $NetBSD: mi,v 1.2417 2022/07/22 15:43:36 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -4254,8 +4254,10 @@
 ./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/libfido2.pc                        comp-c-lib              share
+./usr/lib/pkgconfig/liblzma.pc         comp-c-lib              share
 ./usr/lib/pkgconfig/libssl.pc                  comp-crypto-lib         share
 ./usr/lib/pkgconfig/libuv.pc                   comp-obsolete           share,obsolete
 ./usr/lib/pkgconfig/lutok.pc                   comp-crypto-lib         kyua,share
diff -r e881484db663 -r 578dd47a0949 external/bsd/libarchive/lib/libarchive/Makefile
--- a/external/bsd/libarchive/lib/libarchive/Makefile   Fri Jul 22 12:30:56 2022 +0000
+++ b/external/bsd/libarchive/lib/libarchive/Makefile   Fri Jul 22 15:43:36 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2021/04/12 06:08:30 mrg Exp $
+#      $NetBSD: Makefile,v 1.14 2022/07/22 15:43:37 wiz Exp $
 
 .include <bsd.init.mk>
 
@@ -457,4 +457,21 @@
 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})
diff -r e881484db663 -r 578dd47a0949 external/bsd/libarchive/lib/libarchive/libarchive.pc.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/libarchive/lib/libarchive/libarchive.pc.in   Fri Jul 22 15:43:36 2022 +0000
@@ -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
diff -r e881484db663 -r 578dd47a0949 external/public-domain/xz/lib/Makefile
--- a/external/public-domain/xz/lib/Makefile    Fri Jul 22 12:30:56 2022 +0000
+++ b/external/public-domain/xz/lib/Makefile    Fri Jul 22 15:43:36 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/09/25 05:42:08 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2022/07/22 15:43:37 wiz Exp $
 
 .include <bsd.init.mk>
 
@@ -80,6 +80,9 @@
 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 @@
            -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 @@
 .include <bsd.lib.mk>
 .endif
 
+all: liblzma.pc
+dependall: all