From 85d6d25015c1dd9d006cc3154c6ee65ae018c58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 20 Jan 2013 19:06:50 +0100 Subject: [PATCH] Export proper PKG_CONFIG_{LIBDIR,PATH} for multilib builds. Theoretically, PKG_CONFIG_PATH is enough. However, not setting libdir results in undesired lib64 fallback. --- eclass/multilib.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 65b9ca6..6cc631a 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -395,7 +395,8 @@ multilib_toolchain_setup() { # First restore any saved state we have laying around. if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then - for v in CHOST CBUILD AS CC CXX LD ; do + for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + do vv="__abi_saved_${v}" export ${v}="${!vv}" unset ${vv} @@ -407,7 +408,8 @@ multilib_toolchain_setup() { # screws up ccache and distcc. See #196243 for more info. if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then # Back that multilib-ass up so we can restore it later - for v in CHOST CBUILD AS CC CXX LD ; do + for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + do export __abi_saved_${v}="${!v}" done export __DEFAULT_ABI_SAVED="true" @@ -420,6 +422,8 @@ multilib_toolchain_setup() { export LD="$(tc-getLD) $(get_abi_LDFLAGS)" export CHOST=$(get_abi_CHOST $1) export CBUILD=$(get_abi_CHOST $1) + export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig + export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig fi } -- 1.8.1.1