From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QUguh-0003uV-Sj for garchives@archives.gentoo.org; Thu, 09 Jun 2011 15:12:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45D521C08B; Thu, 9 Jun 2011 15:12:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 179871C08B for ; Thu, 9 Jun 2011 15:12:44 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8945C1B401B for ; Thu, 9 Jun 2011 15:12:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 06FBC8003C for ; Thu, 9 Jun 2011 15:12:43 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: dbc9f3cc4c665af6d5db24bd9fb7544ed711d96f Date: Thu, 9 Jun 2011 15:12:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5b14521ca5ca8a03c2f320a9f22864cc commit: dbc9f3cc4c665af6d5db24bd9fb7544ed711d96f Author: Zac Medico gentoo org> AuthorDate: Thu Jun 9 15:11:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jun 9 15:11:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Ddbc9f3cc ebuild.sh: fix libdir for ccache/distcc This will fix bug #355283. --- bin/ebuild.sh | 10 ++++++++-- 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=3D$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/= sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH unset _ebuild_helpers_path =20 + # Use default ABI libdir in accordance with bug #355283. + x=3DLIBDIR_${DEFAULT_ABI} + [[ -n $DEFAULT_ABI && -n ${!x} ]] && x=3D${!x} || x=3Dlib + if hasq distcc $FEATURES ; then - PATH=3D"/usr/lib/distcc/bin:$PATH" + PATH=3D"/usr/$x/distcc/bin:$PATH" [[ -n $DISTCC_LOG ]] && addwrite "${DISTCC_LOG%/*}" fi =20 if hasq ccache $FEATURES ; then - PATH=3D"/usr/lib/ccache/bin:$PATH" + PATH=3D"/usr/$x/ccache/bin:$PATH" =20 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 =20 + unset x + if [[ -n $QA_PREBUILT ]] ; then =20 # these ones support fnmatch patterns