Restructure hardened/linux/uclibc profiles

7 files changed, 47 insertions, 18 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index fe82360c8304..af1a4074329d 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,20 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7019 2012/10/08 16:09:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7020 2012/10/08 17:57:51 blueness 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!
 
+  08 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened/linux/uclibc/amd64/make.defaults,
+  hardened/linux/uclibc/make.defaults,
+  hardened/linux/uclibc/mips/make.defaults,
+  hardened/linux/uclibc/mips/mipsel/make.defaults,
+  hardened/linux/uclibc/ppc/make.defaults,
+  hardened/linux/uclibc/x86/make.defaults:
+  Restructure hardened/linux/uclibc profiles
+
   08 Oct 2012; Mike Gilbert <floppym@gentoo.org> desc/python_targets.desc:
   Add python3_3.
 
diff --git a/profiles/hardened/linux/uclibc/amd64/make.defaults b/profiles/hardened/linux/uclibc/amd64/make.defaults
index 7c695fb9b2a1..90e4da75900a 100644
--- a/profiles/hardened/linux/uclibc/amd64/make.defaults
+++ b/profiles/hardened/linux/uclibc/amd64/make.defaults
@@ -1,7 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/make.defaults,v 1.2 2012/10/07 11:42:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/make.defaults,v 1.3 2012/10/08 17:57:51 blueness Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
+
 CHOST="x86_64-gentoo-linux-uclibc"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
index 88643d402adc..447348169786 100644
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ b/profiles/hardened/linux/uclibc/make.defaults
@@ -1,10 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/make.defaults,v 1.2 2012/10/07 11:42:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/make.defaults,v 1.3 2012/10/08 17:57:51 blueness Exp $
 
-CFLAGS="-Os"
-CXXFLAGS="${CFLAGS}"
 PORTAGE_LIBC="uClibc"
 ELIBC=uclibc
+
 FEATURES="sandbox sfperms strict"
-USE="hardened ncurses nptl pic readline uclibc unicode xattr zlib -pam"
+
+USE="hardened ncurses nptl pax_kernel pic readline unicode xattr zlib -jit -orc -pam "
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic zlib pax_kernel pic -jit -orc -pam"
+
+SYMLINK_LIB="no"
diff --git a/profiles/hardened/linux/uclibc/mips/make.defaults b/profiles/hardened/linux/uclibc/mips/make.defaults
index 81ca55d11281..33757c56ce44 100644
--- a/profiles/hardened/linux/uclibc/mips/make.defaults
+++ b/profiles/hardened/linux/uclibc/mips/make.defaults
@@ -1,7 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/make.defaults,v 1.2 2012/10/07 11:42:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/make.defaults,v 1.3 2012/10/08 17:57:51 blueness Exp $
 
 ARCH="mips"
-ACCEPT_KEYWORDS="mips ~mips"
+ACCEPT_KEYWORDS="${ARCH} ~${ARCH}"
+
 CHOST="mips-gentoo-linux-uclibc"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults b/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults
index 3b941296666e..7df601f02ea4 100644
--- a/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults
+++ b/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults
@@ -1,7 +1,5 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults,v 1.2 2012/10/07 11:42:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults,v 1.3 2012/10/08 17:57:51 blueness Exp $
 
-ARCH="mips"
-ACCEPT_KEYWORDS="mips ~mips"
 CHOST="mipsel-gentoo-linux-uclibc"
diff --git a/profiles/hardened/linux/uclibc/ppc/make.defaults b/profiles/hardened/linux/uclibc/ppc/make.defaults
index 0c15668b8edd..282e43d65533 100644
--- a/profiles/hardened/linux/uclibc/ppc/make.defaults
+++ b/profiles/hardened/linux/uclibc/ppc/make.defaults
@@ -1,7 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/ppc/make.defaults,v 1.2 2012/10/07 11:42:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/ppc/make.defaults,v 1.3 2012/10/08 17:57:52 blueness Exp $
 
 ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
-CHOST="powerpc-unknown-linux-uclibc"
+ACCEPT_KEYWORDS="${ARCH}"
+
+CHOST="powerpc-gentoo-linux-uclibc"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/uclibc/x86/make.defaults b/profiles/hardened/linux/uclibc/x86/make.defaults
index f35d1048ab92..a047b6825ed8 100644
--- a/profiles/hardened/linux/uclibc/x86/make.defaults
+++ b/profiles/hardened/linux/uclibc/x86/make.defaults
@@ -1,8 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/make.defaults,v 1.17 2012/06/26 13:36:21 blueness Exp 
-$
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/make.defaults,v 1.3 2012/10/08 17:57:52 blueness Exp $
 
 ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-CHOST="i386-gentoo-linux-uclibc"
+ACCEPT_KEYWORDS="${ARCH}"
+
+CHOST="i686-gentoo-linux-uclibc"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"