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 1/2] multilib.eclass: export PKG_CONFIG_SYSTEM_LIBRARY_PATH in multilib_toolchain_setup
Date: Sat, 06 Jun 2020 19:24:46
Message-Id: 20200606192405.45320-2-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 pkg-config --libs will filter -L/usr/lib from its output for
2 non-native ABIs.
3
4 Signed-off-by: Mike Gilbert <floppym@g.o>
5 ---
6 eclass/multilib.eclass | 2 ++
7 1 file changed, 2 insertions(+)
8
9 diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
10 index ed54568aa2d9..3503ac2ed5b7 100644
11 --- a/eclass/multilib.eclass
12 +++ b/eclass/multilib.eclass
13 @@ -472,6 +472,7 @@ multilib_toolchain_setup() {
14 STRIP
15 PKG_CONFIG_LIBDIR
16 PKG_CONFIG_PATH
17 + PKG_CONFIG_SYSTEM_LIBRARY_PATH
18 )
19
20 # First restore any saved state we have laying around.
21 @@ -516,6 +517,7 @@ multilib_toolchain_setup() {
22 export CHOST=$(get_abi_CHOST $1)
23 export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
24 export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig
25 + export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/usr/$(get_libdir)
26 fi
27 }
28
29 --
30 2.27.0.rc2