Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
martin 2023-08-01 15:46:25 +00:00
parent e95a854fd9
commit 764d104173
4 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/sets/lists/comp/mi
View File

@ -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

19
external/bsd/libarchive/lib/libarchive/Makefile vendored
View File

@ -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.c += -Wno-error=implicit-fallthrough
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})

12
external/bsd/libarchive/lib/libarchive/libarchive.pc.in vendored Normal file
View File

@ -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

11
external/public-domain/xz/lib/Makefile vendored
View File

@ -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/liblzma.pc.in
-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/libpthread
.include <bsd.lib.mk>
.endif
all: liblzma.pc
dependall: all