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 <gentoo-commits+bounces-399617-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RODCf-0000dZ-G4
for garchives@archives.gentoo.org; Wed, 09 Nov 2011 18:48:53 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7633C21C020;
Wed, 9 Nov 2011 18:48:45 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 3487B21C020
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Nov 2011 18:48:45 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9B5B41B401F
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Nov 2011 18:48:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 1592B80042
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Nov 2011 18:48:44 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <f75d02eb630c5595127faded4a048268ff59ac17.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/misc-functions.sh bin/phase-helpers.sh
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: f75d02eb630c5595127faded4a048268ff59ac17
Date: Wed, 9 Nov 2011 18:48:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: ab1a0592-1453-40d2-a255-1f0cd18f049f
X-Archives-Hash: 818472da6a4b07d8767a5b8f98496aa3
commit: f75d02eb630c5595127faded4a048268ff59ac17
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 9 18:48:36 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Nov 9 18:48:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Df75d02eb
Use local EPREFIX for uniformity.
The EPREFIX variable is not readonly in EAPI 0, 1, and 2, so we can
declare EPREFIX as a local variable. We must be careful not to let this
variable leak into the environment of ebuild/eclass functions that we
call, since bash propagates local variables to nested function calls.
---
bin/misc-functions.sh | 7 +++----
bin/phase-helpers.sh | 23 +++++++++++------------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index b1f4736..1c11dc5 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -1097,13 +1097,12 @@ __END1__
=20
dyn_rpm() {
=20
- local eprefix=3D${EPREFIX}
- case "$EAPI" in 0|1|2) eprefix=3D ;; esac
+ case "$EAPI" in 0|1|2) local EPREFIX=3D ;; esac
=20
cd "${T}" || die "cd failed"
local machine_name=3D$(uname -m)
- local dest_dir=3D${eprefix}/usr/src/rpm/RPMS/${machine_name}
- addwrite ${eprefix}/usr/src/rpm
+ local dest_dir=3D${EPREFIX}/usr/src/rpm/RPMS/${machine_name}
+ addwrite ${EPREFIX}/usr/src/rpm
addwrite "${RPMDIR}"
dyn_spec
rpmbuild -bb --clean --rmsource "${PF}.spec" || die "Failed to integrat=
e rpm spec file"
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index be8919c..04cf35a 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -374,8 +374,7 @@ unpack() {
econf() {
local x
=20
- local eprefix=3D${EPREFIX}
- case "$EAPI" in 0|1|2) eprefix=3D ;; esac
+ case "$EAPI" in 0|1|2) local EPREFIX=3D ;; esac
=20
_hasg() {
local x s=3D$1
@@ -406,12 +405,12 @@ econf() {
sed -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" -i "$ECONF_SOURCE=
/configure" || \
die "Substition of shebang in '$ECONF_SOURCE/configure' failed"
fi
- if [ -e "${eprefix}"/usr/share/gnuconfig/ ]; then
+ if [ -e "${EPREFIX}"/usr/share/gnuconfig/ ]; then
find "${WORKDIR}" -type f '(' \
-name config.guess -o -name config.sub ')' -print0 | \
while read -r -d $'\0' x ; do
- vecho " * econf: updating ${x/${WORKDIR}\/} with ${eprefix}/usr/shar=
e/gnuconfig/${x##*/}"
- cp -f "${eprefix}"/usr/share/gnuconfig/"${x##*/}" "${x}"
+ vecho " * econf: updating ${x/${WORKDIR}\/} with ${EPREFIX}/usr/shar=
e/gnuconfig/${x##*/}"
+ cp -f "${EPREFIX}"/usr/share/gnuconfig/"${x##*/}" "${x}"
done
fi
=20
@@ -431,7 +430,7 @@ econf() {
if [[ -n ${CONF_LIBDIR} ]] && ! _hasgq --libdir=3D\* "$@" ; then
export CONF_PREFIX=3D$(_hasg --exec-prefix=3D\* "$@")
[[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=3D$(_hasg --prefix=3D\* "$@")
- : ${CONF_PREFIX:=3D${eprefix}/usr}
+ : ${CONF_PREFIX:=3D${EPREFIX}/usr}
CONF_PREFIX=3D${CONF_PREFIX#*=3D}
[[ ${CONF_PREFIX} !=3D /* ]] && CONF_PREFIX=3D"/${CONF_PREFIX}"
[[ ${CONF_LIBDIR} !=3D /* ]] && CONF_LIBDIR=3D"/${CONF_LIBDIR}"
@@ -439,15 +438,15 @@ econf() {
fi
=20
set -- \
- --prefix=3D"${eprefix}"/usr \
+ --prefix=3D"${EPREFIX}"/usr \
${CBUILD:+--build=3D${CBUILD}} \
--host=3D${CHOST} \
${CTARGET:+--target=3D${CTARGET}} \
- --mandir=3D"${eprefix}"/usr/share/man \
- --infodir=3D"${eprefix}"/usr/share/info \
- --datadir=3D"${eprefix}"/usr/share \
- --sysconfdir=3D"${eprefix}"/etc \
- --localstatedir=3D"${eprefix}"/var/lib \
+ --mandir=3D"${EPREFIX}"/usr/share/man \
+ --infodir=3D"${EPREFIX}"/usr/share/info \
+ --datadir=3D"${EPREFIX}"/usr/share \
+ --sysconfdir=3D"${EPREFIX}"/etc \
+ --localstatedir=3D"${EPREFIX}"/var/lib \
"$@" \
${EXTRA_ECONF}
vecho "${ECONF_SOURCE}/configure" "$@"