From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BF966138334 for ; Mon, 19 Aug 2019 19:16:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08A52E086B; Mon, 19 Aug 2019 19:16:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E42A0E086B for ; Mon, 19 Aug 2019 19:16:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A009349E71 for ; Mon, 19 Aug 2019 19:16:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99A1E75F for ; Mon, 19 Aug 2019 19:16:18 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1566242174.e4ffa7d21697f5a2c0396f0354761bdfa7fe6d38.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmissing/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libmissing/libmissing-1.0.0-r1.ebuild dev-libs/libmissing/libmissing-1.0.0.ebuild X-VCS-Directories: dev-libs/libmissing/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: e4ffa7d21697f5a2c0396f0354761bdfa7fe6d38 X-VCS-Branch: master Date: Mon, 19 Aug 2019 19:16:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37d3e6ad-bf2e-4463-ae6a-c4e7ade7ce38 X-Archives-Hash: 11df30b8f1b51494b289e9269429a85a commit: e4ffa7d21697f5a2c0396f0354761bdfa7fe6d38 Author: Fabian Groffen gentoo org> AuthorDate: Mon Aug 19 19:15:52 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Aug 19 19:16:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ffa7d2 dev-libs/libmissing: allow reinstalling itself Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Fabian Groffen gentoo.org> .../{libmissing-1.0.0.ebuild => libmissing-1.0.0-r1.ebuild} | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dev-libs/libmissing/libmissing-1.0.0.ebuild b/dev-libs/libmissing/libmissing-1.0.0-r1.ebuild similarity index 88% rename from dev-libs/libmissing/libmissing-1.0.0.ebuild rename to dev-libs/libmissing/libmissing-1.0.0-r1.ebuild index 270db24a778..c1371f6d4fa 100644 --- a/dev-libs/libmissing/libmissing-1.0.0.ebuild +++ b/dev-libs/libmissing/libmissing-1.0.0-r1.ebuild @@ -83,11 +83,12 @@ src_prepare() { # get platform specific set of missing functions einfo "Including sources for missing functions on ${platform}:" einfo "${modules[*]}" - "${S}"/gnulib-tool \ + "${S}"/gnulib-tool -S \ --import \ --lib=libmissing \ --libtool \ --no-vc-files \ + --no-cache-modules \ "${modules[@]}" sed -i -e '/^noinst_LTLIBRARIES /s/noinst_/lib_/' lib/Makefile.am || die @@ -95,8 +96,7 @@ src_prepare() { cat >> lib/Makefile.am << 'EOS' install-data-local: $(BUILT_SOURCES) @for hdr in $(BUILT_SOURCES); do \ - $(mkinstalldirs) $(DESTDIR)$(includedir)/$${hdr%/*}; \ - $(INSTALL_HEADER) "$$hdr" $(DESTDIR)$(includedir)/$${hdr}; \ + $(INSTALL_HEADER) -D "$$hdr" $(DESTDIR)$(includedir)/missing/$${hdr}; \ done; EOS @@ -105,6 +105,13 @@ EOS src_configure() { cd "${PN}" || die + + # ensure we don't pick up installed libmissing + export CPPFLAGS="${CPPFLAGS/-I${EPREFIX}\/usr\/include\/missing/}" + export LIBS="${LIBS/-lmissing/}" + einfo "CPPFLAGS: ${CPPFLAGS}" + einfo "LIBS: ${LIBS}" + default }