Set PKG_CONFIG_{LIBDIR,PATH} for multilib builds. Approved by vapier in bug #453206.

1 files changed, 6 insertions, 4 deletions

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 65b9ca65370e..13583d038169 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.101 2012/10/17 19:13:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.102 2013/01/21 19:22:25 mgorny Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -395,7 +395,7 @@ 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,PATH} ; do
 			vv="__abi_saved_${v}"
 			export ${v}="${!vv}"
 			unset ${vv}
@@ -407,7 +407,7 @@ 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,PATH} ; do
 			export __abi_saved_${v}="${!v}"
 		done
 		export __DEFAULT_ABI_SAVED="true"
@@ -420,6 +420,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
 }