From e4ffa7d21697f5a2c0396f0354761bdfa7fe6d38 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 19 Aug 2019 21:15:52 +0200 Subject: [PATCH] dev-libs/libmissing: allow reinstalling itself Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Fabian Groffen --- ...sing-1.0.0.ebuild => libmissing-1.0.0-r1.ebuild} | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) rename dev-libs/libmissing/{libmissing-1.0.0.ebuild => libmissing-1.0.0-r1.ebuild} (88%) 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 270db24a778b..c1371f6d4faf 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 } -- 2.26.2