summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2006-04-06 19:47:04 +0000
committerSimon Stelling <blubb@gentoo.org>2006-04-06 19:47:04 +0000
commitd802344f16b10b6529762806cbdd38f7edb57aff (patch)
treee95e82aca4c6b415b7041838a82da84adb4a70bb
parent737507f4ce97cd7408eb7b2196bb86fb524259fe (diff)
downloadportage-d802344f16b10b6529762806cbdd38f7edb57aff.tar.gz
portage-d802344f16b10b6529762806cbdd38f7edb57aff.tar.bz2
portage-d802344f16b10b6529762806cbdd38f7edb57aff.zip
set PKG_CONFIG_PATH correct on multilib systems; bug 126801
svn path=/main/trunk/; revision=3083
-rwxr-xr-xbin/ebuild.sh6
1 files changed, 6 insertions, 0 deletions
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"