Rename STAGE1_USE to BOOTSTRAP_USE, add "cxx unicode" to the base value on base/make.defaults

and make it stack from derived profiles. This should allow gcc to build on stage 2 - bug 390701.

4 files changed, 13 insertions, 11 deletions

diff --git a/profiles/features/32bit-native/make.defaults b/profiles/features/32bit-native/make.defaults
index fde78ed9fe34..b11a321713cf 100644
--- a/profiles/features/32bit-native/make.defaults
+++ b/profiles/features/32bit-native/make.defaults
@@ -1,11 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/32bit-native/make.defaults,v 1.1 2008/04/01 17:41:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/32bit-native/make.defaults,v 1.2 2011/11/17 01:14:26 jmbsvicetto Exp $
 
 FEATURES="-multilib-strict"
 
 USE="-gcc64"
-STAGE1_USE="nptl nptlonly unicode"
 
 MULTILIB_STRICT_DIRS=""
 MULTILIB_STRICT_DENY=""
diff --git a/profiles/features/32bit-userland/make.defaults b/profiles/features/32bit-userland/make.defaults
index 61ede9fa8646..19e77a7916ab 100644
--- a/profiles/features/32bit-userland/make.defaults
+++ b/profiles/features/32bit-userland/make.defaults
@@ -1,7 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/32bit-userland/make.defaults,v 1.3 2011/03/21 04:41:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/32bit-userland/make.defaults,v 1.4 2011/11/17 01:14:26 jmbsvicetto Exp $
 
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
 # We always need gcc64 for 32bit-userland
-STAGE1_USE="nptl nptlonly unicode gcc64"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} gcc64"
 USE="gcc64"
diff --git a/profiles/features/64bit-native/make.defaults b/profiles/features/64bit-native/make.defaults
index de1ee948dd7f..327d9762a491 100644
--- a/profiles/features/64bit-native/make.defaults
+++ b/profiles/features/64bit-native/make.defaults
@@ -1,12 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/make.defaults,v 1.2 2008/11/14 15:43:49 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/make.defaults,v 1.3 2011/11/17 01:14:26 jmbsvicetto Exp $
 
 # We disable the symlink, since we won't be using it.
 SYMLINK_LIB="yes"
 
 USE="-gcc64"
-STAGE1_USE="nptl nptlonly unicode"
 
 # Since we're doing a pure 64-bit, we want LIBDIR to be lib64
 LIBDIR_amd64="lib64"
diff --git a/profiles/features/multilib/make.defaults b/profiles/features/multilib/make.defaults
index d574e41db28c..9c230f885946 100644
--- a/profiles/features/multilib/make.defaults
+++ b/profiles/features/multilib/make.defaults
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.6 2011/04/30 17:53:11 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.7 2011/11/17 01:14:26 jmbsvicetto Exp $
 
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
 # This is so we build with multilib from the start
-STAGE1_USE="multilib nptl nptlonly unicode"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} multilib"
 
 # FEATURES="multilib-strict" specific settings.
 MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib"