[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/stage1/

[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/stage1/

[Jorge Manuel B. S. Vicetto]

commit:     ea9f59ed7e818159227355264d6810de2226cb74
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 04:02:55 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 04:03:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ea9f59ed

Update USE flags for stage1 to add cxx to fix the building of stages - bug 390701.

---
 targets/stage1/stage1-chroot.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 74d36c9..550eef7 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -31,8 +31,8 @@ make_destpath /tmp/stage1root
 
 # Now, we install our packages
 [ -e /etc/make.conf ] && \
-	echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \
+	echo "USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"" \
 	>> /etc/make.conf
 run_merge "--oneshot ${clst_buildpkgs}"
-sed -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
+sed -i "/USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
 	/etc/make.conf

[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/stage1/

[Jorge Manuel B. S. Vicetto]

commit:     b200d72f2f96a2407e7cd753c5b2dc598aa124b2
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 19:30:22 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 19:30:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b200d72f

@£§§@§£ - Next time make sure your "fat" finger doesn't add extra characters to variable names: BOOTSTRAP0_USE -> BOOTSTRAP_USE.

---
 targets/stage1/stage1-chroot.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index dadd0f5..79f127f 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
-BOOTSTRAP0_USE="$(portageq envvar BOOTSTRAP_USE)"
+BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
 FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
 
 ## Sanity check profile