From 18c57f8fbad359b539a227be7b2f342b2fbc95e8 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Thu, 17 Nov 2011 01:14:27 +0000 Subject: [PATCH] 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. --- profiles/ChangeLog | 21 ++++++++++++++++++- profiles/arch/mips/make.defaults | 4 +--- profiles/arch/sh/make.defaults | 10 +++++---- profiles/base/make.defaults | 6 +++++- profiles/features/32bit-native/make.defaults | 5 ++--- .../features/32bit-userland/make.defaults | 8 ++++--- profiles/features/64bit-native/make.defaults | 5 ++--- profiles/features/multilib/make.defaults | 6 ++++-- profiles/hardened/linux/amd64/make.defaults | 5 +---- .../linux/amd64/no-multilib/make.defaults | 6 ++---- profiles/hardened/linux/ia64/make.defaults | 5 +---- profiles/hardened/linux/make.defaults | 6 ++++-- .../linux/powerpc/ppc32/make.defaults | 5 +---- .../linux/powerpc/ppc64/make.defaults | 5 +---- .../hardened/linux/x86/10.0/make.defaults | 5 +---- profiles/hardened/linux/x86/make.defaults | 5 +---- profiles/hardened/make.defaults | 9 +++++--- profiles/uclibc/make.defaults | 5 ++++- profiles/uclibc/mips/hardened/make.defaults | 5 ++++- .../uclibc/mips/mipsel/hardened/make.defaults | 5 ++++- profiles/uclibc/ppc/hardened/make.defaults | 5 ++++- profiles/uclibc/x86/hardened/make.defaults | 5 ++++- 22 files changed, 83 insertions(+), 58 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 57f1702100cf..8e4c0043b34a 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,30 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5917 2011/11/16 13:34:08 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5918 2011/11/17 01:14:25 jmbsvicetto Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 17 Nov 2011; arch/mips/make.defaults, + arch/sh/make.defaults, base/make.defaults, + features/32bit-native/make.defaults, features/32bit-userland/make.defaults, + features/64bit-native/make.defaults, features/multilib/make.defaults, + hardened/linux/amd64/make.defaults, + hardened/linux/amd64/no-multilib/make.defaults, + hardened/linux/ia64/make.defaults, hardened/linux/make.defaults, + hardened/linux/powerpc/ppc32/make.defaults, + hardened/linux/powerpc/ppc64/make.defaults, + hardened/linux/x86/10.0/make.defaults, hardened/linux/x86/make.defaults, + hardened/make.defaults, uclibc/make.defaults, + uclibc/mips/hardened/make.defaults, + uclibc/mips/mipsel/hardened/make.defaults, uclibc/ppc/hardened/make.defaults, + uclibc/x86/hardened/make.defaults: + 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. + 16 Nov 2011; Tony Vroon package.mask: Mask 10 branch of Asterisk due to module loading issues on hardened. diff --git a/profiles/arch/mips/make.defaults b/profiles/arch/mips/make.defaults index 4d59b2ce6e3b..baf14ad4b40b 100644 --- a/profiles/arch/mips/make.defaults +++ b/profiles/arch/mips/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/make.defaults,v 1.8 2011/02/21 17:14:51 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/make.defaults,v 1.9 2011/11/17 01:14:25 jmbsvicetto Exp $ # 2006/08/18 - Donnie Berkholz # Defaults for video drivers @@ -13,8 +13,6 @@ PROFILE_ARCH="mips" USE="-fortran -openmp" -STAGE1_USE="nptl nptlonly" - CHOST="mips-unknown-linux-gnu" # 2010/12/06 - Matt Turner diff --git a/profiles/arch/sh/make.defaults b/profiles/arch/sh/make.defaults index 7670992fc850..7c0fdec31b4c 100644 --- a/profiles/arch/sh/make.defaults +++ b/profiles/arch/sh/make.defaults @@ -1,6 +1,6 @@ -# 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/arch/sh/make.defaults,v 1.1 2008/04/01 17:40:02 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sh/make.defaults,v 1.2 2011/11/17 01:14:25 jmbsvicetto Exp $ # Main SuperH profile @@ -11,7 +11,9 @@ CHOST="sh-unknown-linux-gnu" 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 (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" diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index fb9923181d09..d6cd04bc940d 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.71 2011/08/22 21:43:33 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.72 2011/11/17 01:14:26 jmbsvicetto Exp $ # # System-wide defaults for the Portage system # See portage(5) manpage @@ -100,3 +100,7 @@ USE="${USE} cxx" # 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 (16 Nov 2011) +# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE +BOOTSTRAP_USE="cxx unicode" 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 (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 (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" diff --git a/profiles/hardened/linux/amd64/make.defaults b/profiles/hardened/linux/amd64/make.defaults index d3d61f66db0b..e5d558995f4c 100644 --- a/profiles/hardened/linux/amd64/make.defaults +++ b/profiles/hardened/linux/amd64/make.defaults @@ -1,11 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/make.defaults,v 1.5 2011/03/06 00:49:58 zorry Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/make.defaults,v 1.6 2011/11/17 01:14:26 jmbsvicetto Exp $ USE="justify -pic" CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" - -# STAGE1_USE does not stack -STAGE1_USE="hardened multilib nptl nptlonly" diff --git a/profiles/hardened/linux/amd64/no-multilib/make.defaults b/profiles/hardened/linux/amd64/no-multilib/make.defaults index 297baf431ce8..6361e8534571 100644 --- a/profiles/hardened/linux/amd64/no-multilib/make.defaults +++ b/profiles/hardened/linux/amd64/no-multilib/make.defaults @@ -1,10 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/make.defaults,v 1.1 2010/11/25 13:22:12 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/make.defaults,v 1.2 2011/11/17 01:14:26 jmbsvicetto Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" MULTILIB_ABIS="amd64" - -STAGE1_USE="hardened nptl nptlonly pic" diff --git a/profiles/hardened/linux/ia64/make.defaults b/profiles/hardened/linux/ia64/make.defaults index 474b60d90c0e..60d24dd0d3a1 100644 --- a/profiles/hardened/linux/ia64/make.defaults +++ b/profiles/hardened/linux/ia64/make.defaults @@ -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" +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/make.defaults,v 1.3 2011/11/17 01:14:26 jmbsvicetto Exp $ diff --git a/profiles/hardened/linux/make.defaults b/profiles/hardened/linux/make.defaults index f2b6cf877e60..19f70d6d3694 100644 --- a/profiles/hardened/linux/make.defaults +++ b/profiles/hardened/linux/make.defaults @@ -1,7 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation. # 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 $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v 1.13 2011/11/17 01:14:26 jmbsvicetto Exp $ -STAGE1_USE="hardened nptl nptlonly pax_kernel pic -jit" +# Jorge Manuel B. S. Vicetto (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" diff --git a/profiles/hardened/linux/powerpc/ppc32/make.defaults b/profiles/hardened/linux/powerpc/ppc32/make.defaults index be4815fd1ba6..e3ab6ce266a1 100644 --- a/profiles/hardened/linux/powerpc/ppc32/make.defaults +++ b/profiles/hardened/linux/powerpc/ppc32/make.defaults @@ -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" +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/make.defaults,v 1.3 2011/11/17 01:14:26 jmbsvicetto Exp $ diff --git a/profiles/hardened/linux/powerpc/ppc64/make.defaults b/profiles/hardened/linux/powerpc/ppc64/make.defaults index f719aa77e7f9..c3d1e054246d 100644 --- a/profiles/hardened/linux/powerpc/ppc64/make.defaults +++ b/profiles/hardened/linux/powerpc/ppc64/make.defaults @@ -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" +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/make.defaults,v 1.3 2011/11/17 01:14:27 jmbsvicetto Exp $ diff --git a/profiles/hardened/linux/x86/10.0/make.defaults b/profiles/hardened/linux/x86/10.0/make.defaults index 140f13a22ac2..04740cd1077e 100644 --- a/profiles/hardened/linux/x86/10.0/make.defaults +++ b/profiles/hardened/linux/x86/10.0/make.defaults @@ -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" +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/10.0/make.defaults,v 1.3 2011/11/17 01:14:27 jmbsvicetto Exp $ diff --git a/profiles/hardened/linux/x86/make.defaults b/profiles/hardened/linux/x86/make.defaults index 4b02ea4d5296..8469b58dfd25 100644 --- a/profiles/hardened/linux/x86/make.defaults +++ b/profiles/hardened/linux/x86/make.defaults @@ -1,6 +1,6 @@ # 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/make.defaults,v 1.9 2011/02/13 18:09:39 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/make.defaults,v 1.10 2011/11/17 01:14:27 jmbsvicetto Exp $ ARCH="x86" ACCEPT_KEYWORDS="x86" @@ -9,9 +9,6 @@ CHOST="i686-pc-linux-gnu" 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 diff --git a/profiles/hardened/make.defaults b/profiles/hardened/make.defaults index 1a5b80961ffd..0898755f53a5 100644 --- a/profiles/hardened/make.defaults +++ b/profiles/hardened/make.defaults @@ -1,8 +1,7 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # 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 $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/make.defaults,v 1.20 2011/11/17 01:14:26 jmbsvicetto Exp $ -STAGE1_USE="hardened pic" USE="sysfs urandom xorg" INPUT_DEVICES="mouse keyboard evdev" @@ -12,3 +11,7 @@ INPUT_DEVICES="mouse keyboard evdev" # direction with how LDFLAGS will be set by default, this entry # may move. LDFLAGS="-Wl,-O1" + +# Jorge Manuel B. S. Vicetto (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value +BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic" diff --git a/profiles/uclibc/make.defaults b/profiles/uclibc/make.defaults index 784721f1865e..4c42224245e5 100644 --- a/profiles/uclibc/make.defaults +++ b/profiles/uclibc/make.defaults @@ -1,4 +1,3 @@ -STAGE1_USE="uclibc" GRP_STAGE23_USE="ncurses readline zlib uclibc" USE="ncurses readline zlib uclibc -fortran -pam -berkdb -ipv6 -pppd" CFLAGS="-Os" @@ -6,3 +5,7 @@ CXXFLAGS="${CFLAGS}" PORTAGE_LIBC="uClibc" ELIBC=uclibc FEATURES="sandbox sfperms strict nodoc noinfo noman" + +# Jorge Manuel B. S. Vicetto (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value +BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc" diff --git a/profiles/uclibc/mips/hardened/make.defaults b/profiles/uclibc/mips/hardened/make.defaults index dc69158b26a4..41e2d419addb 100644 --- a/profiles/uclibc/mips/hardened/make.defaults +++ b/profiles/uclibc/mips/hardened/make.defaults @@ -1,3 +1,6 @@ -STAGE1_USE="uclibc hardened pic" GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic" USE="ncurses readline zlib uclibc hardened pic" + +# Jorge Manuel B. S. Vicetto (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value +BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic" diff --git a/profiles/uclibc/mips/mipsel/hardened/make.defaults b/profiles/uclibc/mips/mipsel/hardened/make.defaults index dc69158b26a4..41e2d419addb 100644 --- a/profiles/uclibc/mips/mipsel/hardened/make.defaults +++ b/profiles/uclibc/mips/mipsel/hardened/make.defaults @@ -1,3 +1,6 @@ -STAGE1_USE="uclibc hardened pic" GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic" USE="ncurses readline zlib uclibc hardened pic" + +# Jorge Manuel B. S. Vicetto (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value +BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic" diff --git a/profiles/uclibc/ppc/hardened/make.defaults b/profiles/uclibc/ppc/hardened/make.defaults index dc69158b26a4..41e2d419addb 100644 --- a/profiles/uclibc/ppc/hardened/make.defaults +++ b/profiles/uclibc/ppc/hardened/make.defaults @@ -1,3 +1,6 @@ -STAGE1_USE="uclibc hardened pic" GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic" USE="ncurses readline zlib uclibc hardened pic" + +# Jorge Manuel B. S. Vicetto (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value +BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic" diff --git a/profiles/uclibc/x86/hardened/make.defaults b/profiles/uclibc/x86/hardened/make.defaults index dc69158b26a4..41e2d419addb 100644 --- a/profiles/uclibc/x86/hardened/make.defaults +++ b/profiles/uclibc/x86/hardened/make.defaults @@ -1,3 +1,6 @@ -STAGE1_USE="uclibc hardened pic" GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic" USE="ncurses readline zlib uclibc hardened pic" + +# Jorge Manuel B. S. Vicetto (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value +BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic" -- 2.26.2