Don't forget unicode when unmasking nptl for stage1 on G3 or G4.

3 files changed, 10 insertions, 6 deletions

diff --git a/profiles/default-linux/ppc/dev/2006.0/ppc32/G3/make.defaults b/profiles/default-linux/ppc/dev/2006.0/ppc32/G3/make.defaults
index 523cccd88ef9..299e80786f0e 100644
--- a/profiles/default-linux/ppc/dev/2006.0/ppc32/G3/make.defaults
+++ b/profiles/default-linux/ppc/dev/2006.0/ppc32/G3/make.defaults
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/2006.0/ppc32/G3/make.defaults,v 1.1 2006/01/05 18:05:07 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/2006.0/ppc32/G3/make.defaults,v 1.2 2006/01/08 19:23:07 pylon Exp $
 
 CFLAGS="-O2 -mtune=G3 -mcpu=G3 -pipe"
 CXXFLAGS="${CFLAGS}"
 
 # This is currently commented so that the stage1 tarball can also be used to
 # build no-nptl systems.
-#STAGE1_USE="nptl"
+#STAGE1_USE="nptl unicode"
 STAGE1_USE="unicode"
 USE="${STAGE1_USE} alsa apache2 apm arts avi bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg nptl ogg oggvorbis opengl pdflib png qt quicktime sdl spell truetype truetype-fonts type1-fonts udev vorbis X xml2 xmms xv"
diff --git a/profiles/default-linux/ppc/dev/2006.0/ppc32/G4/make.defaults b/profiles/default-linux/ppc/dev/2006.0/ppc32/G4/make.defaults
index 2c50ed737125..1db8de65429e 100644
--- a/profiles/default-linux/ppc/dev/2006.0/ppc32/G4/make.defaults
+++ b/profiles/default-linux/ppc/dev/2006.0/ppc32/G4/make.defaults
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/2006.0/ppc32/G4/make.defaults,v 1.1 2006/01/05 18:05:07 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/2006.0/ppc32/G4/make.defaults,v 1.2 2006/01/08 19:23:07 pylon Exp $
 
 CFLAGS="-O2 -mtune=G4 -mcpu=G4 -mabi=altivec -pipe"
 CXXFLAGS="${CFLAGS}"
 
 # This is currently commented so that the stage1 tarball can also be used to
 # build no-nptl systems.
-#STAGE1_USE="nptl"
+#STAGE1_USE="altivec nptl unicode"
 STAGE1_USE="altivec unicode"
 USE="${STAGE1_USE} alsa apache2 apm arts avi bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg nptl ogg oggvorbis opengl pdflib png qt quicktime sdl spell truetype truetype-fonts type1-fonts udev vorbis X xml2 xmms xv"
diff --git a/profiles/default-linux/ppc/dev/2006.0/ppc32/make.defaults b/profiles/default-linux/ppc/dev/2006.0/ppc32/make.defaults
index 25663f863daf..5514cc690da9 100644
--- a/profiles/default-linux/ppc/dev/2006.0/ppc32/make.defaults
+++ b/profiles/default-linux/ppc/dev/2006.0/ppc32/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/2006.0/ppc32/make.defaults,v 1.1 2006/01/05 18:05:07 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/2006.0/ppc32/make.defaults,v 1.2 2006/01/08 19:23:07 pylon Exp $
 
 # All extra USE/etc should be specified in sub-profiles.
 # DO NOT POLLUTE USE ON THIS PROFILE.
@@ -14,4 +14,8 @@ CXXFLAGS="${CFLAGS}"
 
 FEATURES="sandbox sfperms"
 
-USE="berkdb crypt ipv6 ncurses nls pam perl python readline ssl tcpd zlib"
+# This is currently commented so that the stage1 tarball can also be used to
+# build no-nptl systems.
+#STAGE1_USE="nptl unicode"
+STAGE1_USE="unicode"
+USE="${STAGE1_USE} berkdb crypt ipv6 ncurses nls pam perl python readline ssl tcpd zlib"