commit: f80c1bfe84e86a802ee892d9800225c978dca59d Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Mon Nov 23 23:00:00 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Nov 25 17:45:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80c1bfe
dev-util/pkgconf: Include /$(get_libdir) in default system libdir. Bug: https://bugs.gentoo.org/756238 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-util/pkgconf/{pkgconf-1.7.3.ebuild => pkgconf-1.7.3-r1.ebuild} | 7 ++++++- dev-util/pkgconf/pkgconf-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dev-util/pkgconf/pkgconf-1.7.3.ebuild b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild similarity index 89% rename from dev-util/pkgconf/pkgconf-1.7.3.ebuild rename to dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild index a801ef026bf..e1d94a66add 100644 --- a/dev-util/pkgconf/pkgconf-1.7.3.ebuild +++ b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild @@ -54,7 +54,12 @@ src_prepare() { multilib_src_configure() { local ECONF_SOURCE="${S}" - econf --disable-static + local args=( + --disable-static + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" } multilib_src_test() { diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild index 40e4e28319d..d592b7e54f1 100644 --- a/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/dev-util/pkgconf/pkgconf-9999.ebuild @@ -54,7 +54,12 @@ src_prepare() { multilib_src_configure() { local ECONF_SOURCE="${S}" - econf --disable-static + local args=( + --disable-static + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" } multilib_src_test() {
