NetBSD-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: lib/57548: lib/pkgconfig/liblzma.pc is missing in base
The following reply was made to PR lib/57548; it has been noted by GNATS.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc:
Subject: Re: lib/57548: lib/pkgconfig/liblzma.pc is missing in base
Date: Sat, 29 Jul 2023 15:32:04 +0200
--PGZKmmtpBD7C7cS7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Sat, Jul 29, 2023 at 03:00:01AM +0000, Izumi Tsutsui wrote:
> >Synopsis: lib/pkgconfig/liblzma.pc is missing in base
It's there in -current. Please request a pullup if you think it will
help (see attachment).
> Put some workaround in pkgsrc for NetBSD?
That already exists, look for override-liblzma-pkgconfig in
archivers/xz/builtin.mk.
(No, I don't know why this isn't sufficient.)
Thomas
--PGZKmmtpBD7C7cS7
Content-Type: message/rfc822
Content-Disposition: inline
Return-Path: <bounces-source-changes-full-owner-wiz=NetBSD.org%NetBSD.org@localhost>
Delivered-To: wiz%gatalith.at@localhost
Received: from gatalith.at
by gatalith.at with LMTP
id xN/MKrDF2mIVRQAA4iLUCg
(envelope-from <bounces-source-changes-full-owner-wiz=NetBSD.org%NetBSD.org@localhost>)
for <wiz%gatalith.at@localhost>; Fri, 22 Jul 2022 17:43:44 +0200
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
by gatalith.at (Postfix) with ESMTPS id BB499390A34
for <wiz%gatalith.at@localhost>; Fri, 22 Jul 2022 17:43:43 +0200 (CEST)
Received: by mail.netbsd.org (Postfix)
id D056D84EC0; Fri, 22 Jul 2022 15:43:39 +0000 (UTC)
Delivered-To: wiz%netbsd.org@localhost
Received: by mail.netbsd.org (Postfix, from userid 605)
id 9650084EBC; Fri, 22 Jul 2022 15:43:39 +0000 (UTC)
Delivered-To: source-changes-full%NetBSD.org@localhost
Received: from localhost (localhost [127.0.0.1])
by mail.netbsd.org (Postfix) with ESMTP id 6BF3D84D4C
for <source-changes-full%NetBSD.org@localhost>; Fri, 22 Jul 2022 15:43:38 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
with ESMTP id VJ6ND5iFd5mz for <source-changes-full%netbsd.org@localhost>;
Fri, 22 Jul 2022 15:43:37 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
by mail.netbsd.org (Postfix) with ESMTP id 8E47584D50
for <source-changes-full%NetBSD.org@localhost>; Fri, 22 Jul 2022 15:43:37 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
id 83F22FB1B; Fri, 22 Jul 2022 15:43:37 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_165850461732560"
MIME-Version: 1.0
Date: Fri, 22 Jul 2022 15:43:37 +0000
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Subject: CVS commit: src
To: source-changes-full%NetBSD.org@localhost
X-Mailer: log_accum
Message-Id: <20220722154337.83F22FB1B%cvs.NetBSD.org@localhost>
Sender: source-changes-full-owner%NetBSD.org@localhost
List-Id: <source-changes-full.NetBSD.org>
Precedence: bulk
Reply-To: source-changes-d%NetBSD.org@localhost
Mail-Reply-To: "Thomas Klausner" <wiz%netbsd.org@localhost>
Mail-Followup-To: source-changes-d%NetBSD.org@localhost
List-Unsubscribe: <mailto:majordomo%NetBSD.org@localhost?subject=Unsubscribe%20source-changes-full&body=unsubscribe%20source-changes-full>
This is a multi-part message in MIME format.
--_----------=_165850461732560
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
Module Name: src
Committed By: wiz
Date: Fri Jul 22 15:43:37 UTC 2022
Modified Files:
src/distrib/sets/lists/comp: mi
src/external/bsd/libarchive/lib/libarchive: Makefile
src/external/public-domain/xz/lib: Makefile
Added Files:
src/external/bsd/libarchive/lib/libarchive: libarchive.pc.in
Log Message:
Build and install pkgconfig files for liblzma and libarchive
To generate a diff of this commit:
cvs rdiff -u -r1.2416 -r1.2417 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.13 -r1.14 \
src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/libarchive/lib/libarchive/libarchive.pc.in
cvs rdiff -u -r1.10 -r1.11 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.
--_----------=_165850461732560
Content-Disposition: inline
Content-Length: 4417
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2416 src/distrib/sets/lists/comp/mi:1.2417
--- src/distrib/sets/lists/comp/mi:1.2416 Mon Jun 6 10:56:27 2022
+++ src/distrib/sets/lists/comp/mi Fri Jul 22 15:43:36 2022
@@ -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
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.13 src/external/bsd/libarchive/lib/libarchive/Makefile:1.14
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.13 Mon Apr 12 06:08:30 2021
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Fri Jul 22 15:43:37 2022
@@ -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.archive_read_support_format_rar5.c
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.11
--- src/external/public-domain/xz/lib/Makefile:1.10 Tue Sep 25 05:42:08 2018
+++ src/external/public-domain/xz/lib/Makefile Fri Jul 22 15:43:37 2022
@@ -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+= 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
--- /dev/null Fri Jul 22 15:43:37 2022
+++ src/external/bsd/libarchive/lib/libarchive/libarchive.pc.in Fri Jul 22 15:43:37 2022
@@ -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
--_----------=_165850461732560--
--PGZKmmtpBD7C7cS7--
Home |
Main Index |
Thread Index |
Old Index