Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org>
Subject: [gentoo-dev] [PATCH] multilib.eclass: Include /$(get_libdir) in PKG_CONFIG_SYSTEM_LIBRARY_PATH.
Date: Tue, 24 Nov 2020 02:56:26
Message-Id: 20201124025535.643202-1-floppym@gentoo.org
1 From: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org>
2
3 Set also PKG_CONFIG_SYSTEM_INCLUDE_PATH for consistency.
4
5 Bug: https://bugs.gentoo.org/756238
6 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org>
7 ---
8 eclass/multilib.eclass | 4 +++-
9 1 file changed, 3 insertions(+), 1 deletion(-)
10
11 diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
12 index 9c7042fcd29..33ca9726131 100644
13 --- a/eclass/multilib.eclass
14 +++ b/eclass/multilib.eclass
15 @@ -498,6 +498,7 @@ multilib_toolchain_setup() {
16 STRIP
17 PKG_CONFIG_LIBDIR
18 PKG_CONFIG_PATH
19 + PKG_CONFIG_SYSTEM_INCLUDE_PATH
20 PKG_CONFIG_SYSTEM_LIBRARY_PATH
21 )
22
23 @@ -547,7 +548,8 @@ multilib_toolchain_setup() {
24 export CHOST=$(get_abi_CHOST $1)
25 export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
26 export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig
27 - export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/usr/$(get_libdir)
28 + export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${EPREFIX}/usr/include
29 + export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)
30 fi
31 }
32
33 --
34 2.29.2

Replies