summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2020-11-23 23:00:00 +0000
committerMike Gilbert <floppym@gentoo.org>2020-11-25 12:45:43 -0500
commitf80c1bfe84e86a802ee892d9800225c978dca59d (patch)
treec34ff09d44b8582131c5eb64d39a8f65a881b023
parentmultilib.eclass: drop amd64 from maintainers (diff)
downloadgentoo-f80c1bfe84e86a802ee892d9800225c978dca59d.tar.gz
gentoo-f80c1bfe84e86a802ee892d9800225c978dca59d.tar.bz2
gentoo-f80c1bfe84e86a802ee892d9800225c978dca59d.zip
dev-util/pkgconf: Include /$(get_libdir) in default system libdir.
Bug: https://bugs.gentoo.org/756238 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild (renamed from dev-util/pkgconf/pkgconf-1.7.3.ebuild)7
-rw-r--r--dev-util/pkgconf/pkgconf-9999.ebuild7
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
index a801ef026bff..e1d94a66add5 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 40e4e28319d4..d592b7e54f14 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() {