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

[Mike Gilbert]

commit:     e76c7f69bf4755eb3c08aa290d072541d0fd65db
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 19:00:15 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=e76c7f69

multilib.eclass: export PKG_CONFIG in multilib_toolchain_setup

This ensures that autoconf will not try to use a crossdev wrapper for
non-native ABIs. Instead, we always use the native pkg-config, and
override its behavior via PKG_CONFIG_LIBDIR and
PKG_CONFIG_SYSTEM_LIBRARY_PATH.

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 3503ac2ed5b..54ff1509ead 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -467,6 +467,7 @@ multilib_toolchain_setup() {
                LD
                NM
                OBJDUMP
+               PKG_CONFIG
                RANLIB
                READELF
                STRIP
@@ -511,6 +512,7 @@ multilib_toolchain_setup() {
                export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
                export NM="$(tc-getNM)" # Avoid 'nm', use '${CHOST}-nm'
                export OBJDUMP="$(tc-getOBJDUMP)" # Avoid 'objdump', use 
'${CHOST}-objdump'
+               export PKG_CONFIG="$(tc-getPKG_CONFIG)"
                export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use 
'${CHOST}-ranlib'
                export READELF="$(tc-getREADELF)" # Avoid 'readelf', use 
'${CHOST}-readelf'
                export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use 
'${CHOST}-strip'