[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     5ee8c9ea46a9e7caaac4a3dc84064be5d96d3963
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 18:56:51 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 16:58:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee8c9ea

multilib.eclass: export PKG_CONFIG_SYSTEM_LIBRARY_PATH in 
multilib_toolchain_setup

This ensures pkg-config --libs will filter -L/usr/lib from its output for
non-native ABIs.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/multilib.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index ed54568aa2d..3503ac2ed5b 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -472,6 +472,7 @@ multilib_toolchain_setup() {
                STRIP
                PKG_CONFIG_LIBDIR
                PKG_CONFIG_PATH
+               PKG_CONFIG_SYSTEM_LIBRARY_PATH
        )
 
        # First restore any saved state we have laying around.
@@ -516,6 +517,7 @@ 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)
        fi
 }