Received: by mail.netbsd.org (Postfix, from userid 605) id 412D784DA3; Wed, 6 Jun 2018 14:21:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B46AF84D70 for ; Wed, 6 Jun 2018 14:21:10 +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 RIpMes6MZu4f for ; Wed, 6 Jun 2018 14:21:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2662684C82 for ; Wed, 6 Jun 2018 14:21:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1FEC2FBEC; Wed, 6 Jun 2018 14:21:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1528294870210170" MIME-Version: 1.0 Date: Wed, 6 Jun 2018 14:21:10 +0000 From: "Patrick Welche" Subject: CVS commit: pkgsrc/archivers/libarchive To: pkgsrc-changes@NetBSD.org Reply-To: prlw1@netbsd.org X-Mailer: log_accum Message-Id: <20180606142110.1FEC2FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1528294870210170 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: prlw1 Date: Wed Jun 6 14:21:10 UTC 2018 Modified Files: pkgsrc/archivers/libarchive: builtin.mk Log Message: Create a fake libarchive.pc for the builtin case. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/archivers/libarchive/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1528294870210170 Content-Disposition: inline Content-Length: 1925 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/libarchive/builtin.mk diff -u pkgsrc/archivers/libarchive/builtin.mk:1.6 pkgsrc/archivers/libarchive/builtin.mk:1.7 --- pkgsrc/archivers/libarchive/builtin.mk:1.6 Tue Feb 28 14:58:09 2017 +++ pkgsrc/archivers/libarchive/builtin.mk Wed Jun 6 14:21:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.6 2017/02/28 14:58:09 joerg Exp $ +# $NetBSD: builtin.mk,v 1.7 2018/06/06 14:21:09 prlw1 Exp $ BUILTIN_PKG:= libarchive @@ -88,3 +88,39 @@ USE_BUILTIN.libarchive!= \ . endif # PREFER.libarchive .endif MAKEVARS+= USE_BUILTIN.libarchive + +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### +CHECK_BUILTIN.libarchive?= no +.if !empty(CHECK_BUILTIN.libarchive:M[nN][oO]) +. if !empty(USE_BUILTIN.libarchive:M[yY][eE][sS]) + +BUILDLINK_TARGETS+= fake-libarchive-pc + +_FAKE_LIBARCHIVE_PC=${BUILDLINK_DIR}/lib/pkgconfig/libarchive.pc + +fake-libarchive-pc: + ${RUN} \ + sedsrc=../../archivers/libarchive/files/build/pkgconfig/libarchive.pc.in; \ + src=${BUILDLINK_PREFIX.libarchive}/lib${LIBABISUFFIX}/pkgconfig/libarchive.pc; \ + dst=${_FAKE_LIBARCHIVE_PC}; \ + ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ + if [ ! -f $${dst} ]; then \ + if [ -f $${src} ]; then \ + ${ECHO_BUILDLINK_MSG} "Symlinking $${src}"; \ + ${LN} -sf $${src} $${dst}; \ + else \ + ${ECHO_BUILDLINK_MSG} "Creating $${dst}"; \ + ${SED} -e s,@prefix@,${BUILDLINK_PREFIX.libarchive}, \ + -e s,@exec_prefix@,${BUILDLINK_PREFIX.libarchive},\ + -e s,@libdir@,${BUILDLINK_PREFIX.libarchive}/lib${LIBABISUFFIX},\ + -e s,@includedir@,${BUILDLINK_PREFIX.libarchive}/include,\ + -e s,@VERSION@,${BUILTIN_VERSION.libarchive}, \ + -e s,@LIBS@,-llzma -lbz2 -lz, \ + $${sedsrc} > $${dst}; \ + fi \ + fi +. endif +.endif --_----------=_1528294870210170--