aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2011-11-18 14:59:18 -0100
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2011-11-18 15:02:33 -0100
commit9481a7aaa14e0859ac5501bc82880260e88add7c (patch)
treecba476ee7e459d22013ef211fd1b548db647cf54
parentUpdate USE flags for stage1 to add cxx to fix the building of stages - bug 39... (diff)
downloadcatalyst-9481a7aaa14e0859ac5501bc82880260e88add7c.tar.gz
catalyst-9481a7aaa14e0859ac5501bc82880260e88add7c.tar.bz2
catalyst-9481a7aaa14e0859ac5501bc82880260e88add7c.zip
Update catalyst targets to reflect the change from STAGE1_USE to BOOTSTRAP_USE and drop cxx from stage1 target as it was added to BOOTSTRAP_USE.
-rw-r--r--targets/stage1/stage1-chroot.sh6
-rw-r--r--targets/support/chroot-functions.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 550eef7..dadd0f5 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -6,7 +6,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
source /tmp/chroot-functions.sh
# Setup our environment
-STAGE1_USE="$(portageq envvar STAGE1_USE)"
+BOOTSTRAP0_USE="$(portageq envvar BOOTSTRAP_USE)"
FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
## Sanity check profile
@@ -31,8 +31,8 @@ make_destpath /tmp/stage1root
# Now, we install our packages
[ -e /etc/make.conf ] && \
- echo "USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"" \
+ echo "USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
>> /etc/make.conf
run_merge "--oneshot ${clst_buildpkgs}"
-sed -i "/USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
+sed -i "/USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
/etc/make.conf
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index b19ce9a..c454aaf 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -291,7 +291,7 @@ show_debug() {
# `set > /tmp/env_dump.${EBUILD_PHASE}` inside /etc/portage/bashrc
# XXX: Also, portageq does *not* source profile.bashrc at any time.
echo
- echo "STAGE1_USE: $(portageq envvar STAGE1_USE)"
+ echo "BOOTSTRAP_USE: $(portageq envvar BOOTSTRAP_USE)"
echo
echo "USE (profile): $(portageq envvar USE)"
echo "FEATURES (profile): $(portageq envvar FEATURES)"