From: Simon Stelling <blubb@gentoo.org>
Date: Thu, 6 Apr 2006 19:47:04 +0000 (-0000)
Subject: set PKG_CONFIG_PATH correct on multilib systems; bug 126801
X-Git-Tag: v2.1_pre8~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d802344f16b10b6529762806cbdd38f7edb57aff;p=portage.git

set PKG_CONFIG_PATH correct on multilib systems; bug 126801

svn path=/main/trunk/; revision=3083
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8dddc4eb9..3f2610c4e 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -880,6 +880,12 @@ dyn_compile() {
 	[ "${DISTCC_DIR-unset}"  == "unset" ] && export DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
 	[ ! -z "${DISTCC_DIR}" ] && addwrite "${DISTCC_DIR}"
 
+	LIBDIR_VAR="LIBDIR_${ABI}"
+	if [ -z "${PKG_CONFIG_PATH}" -a -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
+		export PKG_CONFIG_PATH="/usr/${!LIBDIR_VAR}/pkgconfig"
+	fi
+	unset LIBDIR_VAR
+
 	if hasq noauto $FEATURES &>/dev/null && [ ! -f ${PORTAGE_BUILDDIR}/.unpacked ]; then
 		echo
 		echo "!!! We apparently haven't unpacked... This is probably not what you"