The building of stages was broken with the move from nocxx to cxx in the tree[1], [2], [3], [4]. Getting new stages building will require updates to the catalyst code and to the profiles. [1] - http://archives.gentoo.org/gentoo-dev/msg_b8ac9e6ef5478b305056e1c695fe4568.xml [2] - http://archives.gentoo.org/gentoo-releng-autobuilds/msg_fe48c54671d149468107e704b993ab72.xml [3] - http://archives.gentoo.org/gentoo-releng-autobuilds/msg_772f99544561b8f1af5b73adca5d59ac.xml [4] - http://archives.gentoo.org/gentoo-releng-autobuilds/msg_a6f63787fda9dc94deeb8e93a72140f4.xml
Update to catalyst to update the USE flag for stage1 committed[1]. [1] - http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commitdiff;h=ea9f59ed7e818159227355264d6810de2226cb74
Suggested update to profiles. The features/32bit-native profile seems to be unused anywhere so it could (should?) probably be dropped from the tree. The nptl and nptlonly use flags are left out as they're currently not set on any make.defaults except for some hardened profiles. If they are desired / required, they can be set globally or in supported arches / profiles. The unicode use flag was added to base/make.defaults as talking to Andrew (agaffney) and Zac (zmedico) it seemed desired. Index: arch/mips/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/arch/mips/make.defaults,v retrieving revision 1.8 diff -u -r1.8 make.defaults --- arch/mips/make.defaults 21 Feb 2011 17:14:51 -0000 1.8 +++ arch/mips/make.defaults 16 Nov 2011 04:49:35 -0000 @@ -13,8 +13,6 @@ USE="-fortran -openmp" -STAGE1_USE="nptl nptlonly" - CHOST="mips-unknown-linux-gnu" # 2010/12/06 - Matt Turner <mattst88@gentoo.org> Index: arch/sh/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/arch/sh/make.defaults,v retrieving revision 1.1 diff -u -r1.1 make.defaults --- arch/sh/make.defaults 1 Apr 2008 17:40:02 -0000 1.1 +++ arch/sh/make.defaults 16 Nov 2011 04:49:35 -0000 @@ -11,7 +11,9 @@ CFLAGS="-O2" CXXFLAGS="${CFLAGS}" -# We define our own STAGE1_USE, since we need to disable ssp. -STAGE1_USE="nptl nptlonly unicode nossp" +# 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 need to disable ssp. +BOOTSTRAP_USE="${BOOTSTRAP_USE} nossp" USE="nossp" Index: base/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v retrieving revision 1.71 diff -u -r1.71 make.defaults --- base/make.defaults 22 Aug 2011 21:43:33 -0000 1.71 +++ base/make.defaults 16 Nov 2011 04:49:35 -0000 @@ -100,3 +100,7 @@ # We usually don't want python to (re)write .py[co] files during phase runs # since it could cause sandbox violations PYTHONDONTWRITEBYTECODE="1" + +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011) +# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE +BOOTSTRAP_USE="cxx unicode" Index: features/32bit-native/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/features/32bit-native/make.defaults,v retrieving revision 1.1 diff -u -r1.1 make.defaults --- features/32bit-native/make.defaults 1 Apr 2008 17:41:06 -0000 1.1 +++ features/32bit-native/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -5,7 +5,10 @@ FEATURES="-multilib-strict" USE="-gcc64" -STAGE1_USE="nptl nptlonly unicode" + +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011) +# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE +BOOTSTRAP_USE="cxx nptl nptlonly unicode" MULTILIB_STRICT_DIRS="" MULTILIB_STRICT_DENY="" Index: features/32bit-userland/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/features/32bit-userland/make.defaults,v retrieving revision 1.3 diff -u -r1.3 make.defaults --- features/32bit-userland/make.defaults 21 Mar 2011 04:41:29 -0000 1.3 +++ features/32bit-userland/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -2,6 +2,8 @@ # 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 $ +# 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" Index: features/64bit-native/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/make.defaults,v retrieving revision 1.2 diff -u -r1.2 make.defaults --- features/64bit-native/make.defaults 14 Nov 2008 15:43:49 -0000 1.2 +++ features/64bit-native/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -6,7 +6,6 @@ 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" Index: features/multilib/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v retrieving revision 1.6 diff -u -r1.6 make.defaults --- features/multilib/make.defaults 30 Apr 2011 17:53:11 -0000 1.6 +++ features/multilib/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -2,8 +2,10 @@ # 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 $ +# 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" Index: hardened/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/make.defaults,v retrieving revision 1.19 diff -u -r1.19 make.defaults --- hardened/make.defaults 7 Jul 2009 18:26:48 -0000 1.19 +++ hardened/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/make.defaults,v 1.19 2009/07/07 18:26:48 gengor Exp $ -STAGE1_USE="hardened pic" USE="sysfs urandom xorg" INPUT_DEVICES="mouse keyboard evdev" @@ -12,3 +11,7 @@ # direction with how LDFLAGS will be set by default, this entry # may move. LDFLAGS="-Wl,-O1" + +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value +BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic" Index: hardened/linux/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v retrieving revision 1.12 diff -u -r1.12 make.defaults --- hardened/linux/make.defaults 31 Aug 2011 22:47:29 -0000 1.12 +++ hardened/linux/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v 1.12 2011/08/31 22:47:29 zorry Exp $ -STAGE1_USE="hardened nptl nptlonly pax_kernel pic -jit" +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value +BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pax_kernel pic -jit" USE="-fortran hardened -ipv6 -jit pax_kernel pic sysfs -unicode urandom" Index: hardened/linux/amd64/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/make.defaults,v retrieving revision 1.5 diff -u -r1.5 make.defaults --- hardened/linux/amd64/make.defaults 6 Mar 2011 00:49:58 -0000 1.5 +++ hardened/linux/amd64/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -6,6 +6,3 @@ CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" - -# STAGE1_USE does not stack -STAGE1_USE="hardened multilib nptl nptlonly" Index: hardened/linux/amd64/no-multilib/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/make.defaults,v retrieving revision 1.1 diff -u -r1.1 make.defaults --- hardened/linux/amd64/no-multilib/make.defaults 25 Nov 2010 13:22:12 -0000 1.1 +++ hardened/linux/amd64/no-multilib/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -6,5 +6,3 @@ ACCEPT_KEYWORDS="${ARCH}" MULTILIB_ABIS="amd64" - -STAGE1_USE="hardened nptl nptlonly pic" Index: hardened/linux/ia64/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/make.defaults,v retrieving revision 1.2 diff -u -r1.2 make.defaults --- hardened/linux/ia64/make.defaults 13 Feb 2011 18:09:39 -0000 1.2 +++ hardened/linux/ia64/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -1,6 +1,3 @@ # Copyright 1999-2011 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $ - -# STAGE1_USE does not stack -STAGE1_USE="hardened nptl nptlonly pic" Index: hardened/linux/powerpc/ppc32/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/make.defaults,v retrieving revision 1.2 diff -u -r1.2 make.defaults --- hardened/linux/powerpc/ppc32/make.defaults 13 Feb 2011 18:09:39 -0000 1.2 +++ hardened/linux/powerpc/ppc32/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -1,6 +1,3 @@ # Copyright 1999-2011 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $ - -# STAGE1_USE does not stack -STAGE1_USE="hardened nptl nptlonly pic" Index: hardened/linux/powerpc/ppc64/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/make.defaults,v retrieving revision 1.2 diff -u -r1.2 make.defaults --- hardened/linux/powerpc/ppc64/make.defaults 13 Feb 2011 18:09:39 -0000 1.2 +++ hardened/linux/powerpc/ppc64/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -1,6 +1,3 @@ # Copyright 1999-2011 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $ - -# STAGE1_USE does not stack -STAGE1_USE="hardened nptl nptlonly pic" Index: hardened/linux/x86/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/make.defaults,v retrieving revision 1.9 diff -u -r1.9 make.defaults --- hardened/linux/x86/make.defaults 13 Feb 2011 18:09:39 -0000 1.9 +++ hardened/linux/x86/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -9,9 +9,6 @@ CFLAGS="-march=i686 -O2 -pipe" CXXFLAGS="${CFLAGS}" -# STAGE1_USE does not stack -STAGE1_USE="hardened nptl nptlonly pic" - USE="nptl nptlonly" # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org> Index: hardened/linux/x86/10.0/make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/10.0/make.defaults,v retrieving revision 1.2 diff -u -r1.2 make.defaults --- hardened/linux/x86/10.0/make.defaults 13 Feb 2011 18:09:39 -0000 1.2 +++ hardened/linux/x86/10.0/make.defaults 16 Nov 2011 04:49:36 -0000 @@ -1,6 +1,3 @@ # Copyright 1999-2011 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/10.0/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $ - -# STAGE1_USE does not stack -STAGE1_USE="hardened nptl nptlonly pic"
Any objections or corrections for the above patch?
It looks good to me. It's nice to see all those old STAGE1_USE settings get removed. It make me take notice that the default/linux/x86/10.0 profile that I use to build stages doesn't even have a STAGE1_USE setting.
please post patches as attachments. the comments field mungs things (as it has here). you can drop nptl/nptlonly from the BOOTSTRAP_USE. that isn't utilized anywhere anymore except in glibc, but not in any version in the tree. i don't see any updates to scripts/bootstrap.sh in this patch. the features/32bit-native/make.defaults file looks like it forgets to append.
(In reply to comment #5) > please post patches as attachments. the comments field mungs things (as it has > here). In a minute. > you can drop nptl/nptlonly from the BOOTSTRAP_USE. that isn't utilized > anywhere anymore except in glibc, but not in any version in the tree. Should we drop it from USE in the hardened profiles as well? > i don't see any updates to scripts/bootstrap.sh in this patch. Because it was too late yesterday to get to it. > the features/32bit-native/make.defaults file looks like it forgets to append. The thing is no profile under profiles seems to inherit from it and the features/32bit-native profile has no parent. $ find $(portageq portdir)/profiles -iname parent -exec grep -H features/32bit-native {} \; $ find $(portageq portdir)/profiles -iname parent -exec grep -H features {} \; /usr/portage/profiles/hardened/linux/amd64/selinux/parent:../../../../features/selinux /usr/portage/profiles/hardened/linux/amd64/no-multilib/selinux/parent:../../../../../features/selinux /usr/portage/profiles/hardened/linux/amd64/no-multilib/parent:../../../../features/64bit-native /usr/portage/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent:../../../../../features/64bit-native /usr/portage/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent:../../../../../features/32bit-userland /usr/portage/profiles/hardened/linux/x86/selinux/parent:../../../../features/selinux /usr/portage/profiles/arch/mips/mips64/multilib/parent:../../../../features/multilib /usr/portage/profiles/arch/mips/mipsel/mips64el/multilib/parent:../../../../../features/multilib /usr/portage/profiles/arch/amd64/parent:../../features/multilib/lib32 /usr/portage/profiles/arch/powerpc/ppc64/32ul/parent:../../../../features/32bit-userland /usr/portage/profiles/arch/powerpc/ppc64/64ul/parent:../../../../features/64bit-native /usr/portage/profiles/arch/amd64-fbsd/parent:../../features/multilib/lib32 /usr/portage/profiles/default/linux/amd64/10.0/no-multilib/parent:../../../../../features/64bit-native /usr/portage/profiles/default/linux/amd64/2008.0/no-multilib/parent:../../../../../features/64bit-native /usr/portage/profiles/default/linux/sparc/10.0/parent:../../../../features/32bit-userland /usr/portage/profiles/default/linux/sparc/experimental/multilib/parent:../../../../../features/multilib/lib32 $
Created attachment 292773 [details, diff] STAGE1_USE update patch for profiles
Created attachment 292775 [details, diff] STAGE1_USE update patch for bootstrap.sh
I didn't touch the uclibc profiles as I didn't know how you (we?) want to handle them. find . -iname make.defaults -exec grep -H STAGE1_USE {} \; ./arch/sh/make.defaults:# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value ./uclibc/mips/mipsel/hardened/make.defaults:STAGE1_USE="uclibc hardened pic" ./uclibc/mips/hardened/make.defaults:STAGE1_USE="uclibc hardened pic" ./uclibc/x86/hardened/make.defaults:STAGE1_USE="uclibc hardened pic" ./uclibc/make.defaults:STAGE1_USE="uclibc" ./uclibc/ppc/hardened/make.defaults:STAGE1_USE="uclibc hardened pic" ./hardened/linux/make.defaults:# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value ./hardened/make.defaults:# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value ./features/multilib/make.defaults:# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value ./features/32bit-native/make.defaults:# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE ./features/32bit-userland/make.defaults:# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value ./base/make.defaults:# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE $
just fix features/32bit-native/ the same way as you've fixed every other profile as for uClibc profiles, fix them in the same way. the root should append "uclibc", and the subdirs should append "hardened pic". i migrated that tree to base/ a while ago so we could stop copying things.
Created attachment 292827 [details, diff] STAGE1_USE update patch for profiles Updated patch to be committed to the tree.
Both profiles and bootstrap.sh have been updated in the tree. I'll work on getting out a new release of catalyst so we can get this bug fixed. I'm going to test some stage building on my box in the meanwhile (I've patched catalyst locally).
i don't think the mini changelog's have value: +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value for the make.defaults that are now empty, i'd delete them. like hardened/linux/powerpc/ppc{32,64}/make.defaults.
When doing a crossdev --b 2.18-r3 --l 2.10.1-r1 armv7a-hardfloat-linux-gnueabi, I'm getting the following error: * Messages for package cross-armv7a-hardfloat-linux-gnueabi/gcc-4.5.3-r1: * We are migrating USE=nocxx to USE=cxx, but your USE settings do not make * sense. Please make sure these two flags line up logically in your setup. * ERROR: cross-armv7a-hardfloat-linux-gnueabi/gcc-4.5.3-r1 failed (compile phase): * USE='cxx nocxx' and USE='-cxx -nocxx' make no sense Is this an error related to this bug? Or related to crossdev?
this bug has nothing to do with crossdev. please search for the relevant (closed) bug as it's fixed in unstable.
This is fixed, so closing.
