aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-09 15:11:08 (GMT)
committerZac Medico <zmedico@gentoo.org>2011-06-09 15:11:08 (GMT)
commitdbc9f3cc4c665af6d5db24bd9fb7544ed711d96f (patch)
tree04427885590b26a0acab2aa0b18fb868879e45d6
parentebuild.sh: don't hardcode distcc pump path (diff)
downloadportage-dbc9f3cc4c665af6d5db24bd9fb7544ed711d96f.zip
portage-dbc9f3cc4c665af6d5db24bd9fb7544ed711d96f.tar.gz
portage-dbc9f3cc4c665af6d5db24bd9fb7544ed711d96f.tar.bz2
ebuild.sh: fix libdir for ccache/distcc
This will fix bug #355283.
-rwxr-xr-xbin/ebuild.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9ca41a6..8c301d8 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -2118,13 +2118,17 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm ; then
PATH=$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
unset _ebuild_helpers_path
+ # Use default ABI libdir in accordance with bug #355283.
+ x=LIBDIR_${DEFAULT_ABI}
+ [[ -n $DEFAULT_ABI && -n ${!x} ]] && x=${!x} || x=lib
+
if hasq distcc $FEATURES ; then
- PATH="/usr/lib/distcc/bin:$PATH"
+ PATH="/usr/$x/distcc/bin:$PATH"
[[ -n $DISTCC_LOG ]] && addwrite "${DISTCC_LOG%/*}"
fi
if hasq ccache $FEATURES ; then
- PATH="/usr/lib/ccache/bin:$PATH"
+ PATH="/usr/$x/ccache/bin:$PATH"
if [[ -n $CCACHE_DIR ]] ; then
addread "$CCACHE_DIR"
@@ -2134,6 +2138,8 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm ; then
[[ -n $CCACHE_SIZE ]] && ccache -M $CCACHE_SIZE &> /dev/null
fi
+ unset x
+
if [[ -n $QA_PREBUILT ]] ; then
# these ones support fnmatch patterns