Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: Mike Gilbert <floppym@g.o>
Subject: [gentoo-dev] [PATCH 2/2] multilib.eclass: export PKG_CONFIG in multilib_toolchain_setup
Date: Sat, 06 Jun 2020 19:25:06
Message-Id: 20200606192405.45320-3-floppym@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/2] multilib.eclass: improve multilib handling of pkg-config by Mike Gilbert
1 This ensures that autoconf will not try to use a crossdev wrapper for
2 non-native ABIs. Instead, we always use the native pkg-config, and
3 override its behavior via PKG_CONFIG_LIBDIR and
4 PKG_CONFIG_SYSTEM_LIBRARY_PATH.
5
6 Signed-off-by: Mike Gilbert <floppym@g.o>
7 ---
8 eclass/multilib.eclass | 2 ++
9 1 file changed, 2 insertions(+)
10
11 diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
12 index 3503ac2ed5b7..54ff1509eada 100644
13 --- a/eclass/multilib.eclass
14 +++ b/eclass/multilib.eclass
15 @@ -467,6 +467,7 @@ multilib_toolchain_setup() {
16 LD
17 NM
18 OBJDUMP
19 + PKG_CONFIG
20 RANLIB
21 READELF
22 STRIP
23 @@ -511,6 +512,7 @@ multilib_toolchain_setup() {
24 export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
25 export NM="$(tc-getNM)" # Avoid 'nm', use '${CHOST}-nm'
26 export OBJDUMP="$(tc-getOBJDUMP)" # Avoid 'objdump', use '${CHOST}-objdump'
27 + export PKG_CONFIG="$(tc-getPKG_CONFIG)"
28 export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use '${CHOST}-ranlib'
29 export READELF="$(tc-getREADELF)" # Avoid 'readelf', use '${CHOST}-readelf'
30 export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip'
31 --
32 2.27.0.rc2