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-433655-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1S3AyP-0007we-Q6
for garchives@archives.gentoo.org; Thu, 01 Mar 2012 18:43:30 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CDA68E07C7;
Thu, 1 Mar 2012 18:43:17 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id A10B0E07C7
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Mar 2012 18:43:17 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0BB101B4028
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Mar 2012 18:43:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id A4D95E542E
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Mar 2012 18:43:15 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1330579673.086fdbcfb68b6cedc5dfc2c4fd35245b57c2df02.vapier@gentoo>
Subject: [gentoo-commits] proj/crossdev:master commit in: /
X-VCS-Repository: proj/crossdev
X-VCS-Files: crossdev
X-VCS-Directories: /
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: 086fdbcfb68b6cedc5dfc2c4fd35245b57c2df02
X-VCS-Branch: master
Date: Thu, 1 Mar 2012 18:43:15 +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: 9f2110ea-d02f-4e65-93bf-f63ae65274ec
X-Archives-Hash: fcbabe49074e2d2daad1e665f8bad66a
commit: 086fdbcfb68b6cedc5dfc2c4fd35245b57c2df02
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 1 05:26:39 2012 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 1 05:27:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;=
a=3Dcommit;h=3D086fdbcf
crossdev: move custom env from bashrc to package.env
Since we only want to tweak the variables in the env and not execute
arbitrary scripts, use package.env rather than bashrc to override.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
---
crossdev | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/crossdev b/crossdev
index f0306fc..8979ca3 100755
--- a/crossdev
+++ b/crossdev
@@ -311,7 +311,7 @@ uninstall() {
[[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \
&& rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET}
local f
- for f in categories package.{mask,keywords,use} profile/package.use.{fo=
rce,mask} ; do
+ for f in categories package.{env,mask,keywords,use} profile/package.use=
.{force,mask} ; do
rm -f "${f}"/cross-${CTARGET}
rmdir "${f}" 2>/dev/null
done
@@ -794,7 +794,7 @@ set_env() {
local pkg=3D$1 env=3D$2 output
shift ; shift
=20
- output=3D"env/cross-${CTARGET}/${pkg}"
+ output=3D"env/cross-${CTARGET}/${pkg}.conf"
cat <<-EOF > "${output}"
SYMLINK_LIB=3Dno
$(printf '%b' "${env}")
@@ -805,6 +805,9 @@ set_env() {
for v in ${!CFLAGS_*} ${!CHOST_*} ${!CTARGET_*} ${!LDFLAGS_*} ${!LIBDIR=
_*} ABI MULTILIB_ABIS DEFAULT_ABI ; do
echo "${v}=3D'${!v}'" >> "${output}"
done
+
+ output=3D$(_set_portage_file ${pkg} package.env)
+ echo "cross-${CTARGET}/${pkg} cross-${CTARGET}/${pkg}.conf" >> ${output=
}
}
set_portage() {
local cat=3D$1 pkg=3D$2 ver=3D$3 env=3D$4 ovl=3D$5
@@ -894,7 +897,7 @@ grep -qs "^cross-${CTARGET}$" "${CONFIGROOT}"/categor=
ies \
|| echo cross-${CTARGET} >> "${CONFIGROOT}"/categories
mkdir -p "${CROSSDEV_OVERLAY}"/cross-${CTARGET} || exit 1
cd "${CONFIGROOT}"
-for f in package.{keywords,mask,use} env/cross-${CTARGET} profile/packag=
e.use.{force,mask} ; do
+for f in package.{env,keywords,mask,use} env/cross-${CTARGET} profile/pa=
ckage.use.{force,mask} ; do
[[ -f ${f} ]] && die "please convert ${CONFIGROOT}/${f} to a directory"
mkdir -p ${f} || die "wtf!?"
rm -f ${f}/cross-${CTARGET}