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 8dddc4eb9decf674e880fbefbe040cea10a13291..3f2610c4e89af2f765a1d6c30368f891a58d16d3 100755 (executable)
--- 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"