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:40 -0500
commitdb1630476083e7a09767e9bd96ecdb7ac3f7496c (patch)
tree2bfe892de55babf9fdf60406e7c2aa458912c327 /eclass/multilib.eclass
parentnet-misc/minidlna: fix build with gcc-10 (diff)
downloadgentoo-db1630476083e7a09767e9bd96ecdb7ac3f7496c.tar.gz
gentoo-db1630476083e7a09767e9bd96ecdb7ac3f7496c.tar.bz2
gentoo-db1630476083e7a09767e9bd96ecdb7ac3f7496c.zip
multilib.eclass: Include /$(get_libdir) in PKG_CONFIG_SYSTEM_LIBRARY_PATH.
Set also PKG_CONFIG_SYSTEM_INCLUDE_PATH for consistency. Bug: https://bugs.gentoo.org/756238 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'eclass/multilib.eclass')
-rw-r--r--eclass/multilib.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 9c7042fcd299..33ca97261318 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -498,6 +498,7 @@ multilib_toolchain_setup() {
STRIP
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
+ PKG_CONFIG_SYSTEM_INCLUDE_PATH
PKG_CONFIG_SYSTEM_LIBRARY_PATH
)
@@ -547,7 +548,8 @@ multilib_toolchain_setup() {
export CHOST=$(get_abi_CHOST $1)
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig
- export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/usr/$(get_libdir)
+ export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${EPREFIX}/usr/include
+ export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)
fi
}