put in settings from make.globals per #89181

10 files changed, 60 insertions, 10 deletions

diff --git a/profiles/selinux/2004.1/amd64/make.defaults b/profiles/selinux/2004.1/amd64/make.defaults
index 0d1ec760a5fa..d17dddb75161 100644
--- a/profiles/selinux/2004.1/amd64/make.defaults
+++ b/profiles/selinux/2004.1/amd64/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/amd64/make.defaults,v 1.6 2005/01/17 22:07:42 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/amd64/make.defaults,v 1.7 2005/04/16 14:51:57 pebenito Exp $
 
 USE="amd64 emul-linux-x86 multilib"
 STAGE1_USE="amd64 multilib"
@@ -8,6 +8,11 @@ GRP_STAGE23_USE="amd64 multilib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
+
+CHOST="x86_64-pc-linux-gnu"
+CFLAGS="-march=x86-64 -O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 #FEATURES="sandbox"
 
 CONF_LIBDIR="lib"
diff --git a/profiles/selinux/2004.1/ppc/make.defaults b/profiles/selinux/2004.1/ppc/make.defaults
index 13e26de5b497..46e0bd2358a2 100644
--- a/profiles/selinux/2004.1/ppc/make.defaults
+++ b/profiles/selinux/2004.1/ppc/make.defaults
@@ -1,9 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/ppc/make.defaults,v 1.9 2004/11/24 00:57:28 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/ppc/make.defaults,v 1.10 2005/04/16 14:51:57 pebenito Exp $
 
 USE="ppc"
 GRP_STAGE23_USE="ppc"
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
+
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
diff --git a/profiles/selinux/2004.1/sparc64/make.defaults b/profiles/selinux/2004.1/sparc64/make.defaults
index ce7a826cb144..845a8f7fd284 100644
--- a/profiles/selinux/2004.1/sparc64/make.defaults
+++ b/profiles/selinux/2004.1/sparc64/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/sparc64/make.defaults,v 1.10 2004/11/24 00:57:28 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/sparc64/make.defaults,v 1.11 2005/04/16 14:51:57 pebenito Exp $
 
 USE="sparc"
 GRP_STAGE23_USE="sparc"
@@ -8,3 +8,7 @@ GRP_STAGE23_USE="sparc"
 ARCH="sparc"
 PROFILE_ARCH="sparc64"
 ACCEPT_KEYWORDS="sparc"
+
+CHOST="sparc-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
diff --git a/profiles/selinux/2004.1/x86-uclibc/make.defaults b/profiles/selinux/2004.1/x86-uclibc/make.defaults
index a1e1687e5839..815d28a30044 100644
--- a/profiles/selinux/2004.1/x86-uclibc/make.defaults
+++ b/profiles/selinux/2004.1/x86-uclibc/make.defaults
@@ -1,10 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86-uclibc/make.defaults,v 1.1 2005/02/01 00:29:24 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86-uclibc/make.defaults,v 1.2 2005/04/16 14:51:57 pebenito Exp $
 
 USE="x86 uclibc"
 GRP_STAGE23_USE="x86 uclibc"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
+
+CHOST="i386-pc-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 FEATURES=""
diff --git a/profiles/selinux/2004.1/x86/make.defaults b/profiles/selinux/2004.1/x86/make.defaults
index 42bc953a641e..2208777eeaaf 100644
--- a/profiles/selinux/2004.1/x86/make.defaults
+++ b/profiles/selinux/2004.1/x86/make.defaults
@@ -1,10 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/make.defaults,v 1.9 2005/03/30 01:25:19 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/make.defaults,v 1.10 2005/04/16 14:51:57 pebenito Exp $
 
 USE="x86"
 GRP_STAGE23_USE="x86"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
+
+CHOST="i686-pc-linux-gnu"
+CFLAGS="-O2 -mcpu=i686 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 #FEATURES="sandbox"
diff --git a/profiles/selinux/2005.1/amd64/make.defaults b/profiles/selinux/2005.1/amd64/make.defaults
index 5690fb5b5ed0..3b9328eb0409 100644
--- a/profiles/selinux/2005.1/amd64/make.defaults
+++ b/profiles/selinux/2005.1/amd64/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/make.defaults,v 1.1 2005/04/02 15:48:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/make.defaults,v 1.2 2005/04/16 14:51:57 pebenito Exp $
 
 USE="amd64 emul-linux-x86 multilib"
 STAGE1_USE="amd64 multilib"
@@ -8,6 +8,11 @@ GRP_STAGE23_USE="amd64 multilib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
+
+CHOST="x86_64-pc-linux-gnu"
+CFLAGS="-march=x86-64 -O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 #FEATURES="sandbox"
 
 MULTILIB_ABIS="x86 amd64"
diff --git a/profiles/selinux/2005.1/ppc/make.defaults b/profiles/selinux/2005.1/ppc/make.defaults
index 26ee2867188f..29a478f4cd87 100644
--- a/profiles/selinux/2005.1/ppc/make.defaults
+++ b/profiles/selinux/2005.1/ppc/make.defaults
@@ -1,9 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/ppc/make.defaults,v 1.1 2005/04/02 15:48:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/ppc/make.defaults,v 1.2 2005/04/16 14:51:57 pebenito Exp $
 
 USE="ppc"
 GRP_STAGE23_USE="ppc"
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
+
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
+FEATURES=""
diff --git a/profiles/selinux/2005.1/sparc64/make.defaults b/profiles/selinux/2005.1/sparc64/make.defaults
index 6f3ffa07ba54..7c221c178a8d 100644
--- a/profiles/selinux/2005.1/sparc64/make.defaults
+++ b/profiles/selinux/2005.1/sparc64/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/sparc64/make.defaults,v 1.1 2005/04/02 15:48:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/sparc64/make.defaults,v 1.2 2005/04/16 14:51:57 pebenito Exp $
 
 USE="sparc"
 GRP_STAGE23_USE="sparc"
@@ -8,3 +8,9 @@ GRP_STAGE23_USE="sparc"
 ARCH="sparc"
 PROFILE_ARCH="sparc64"
 ACCEPT_KEYWORDS="sparc"
+
+CHOST="sparc-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
+FEATURES=""
diff --git a/profiles/selinux/2005.1/x86-uclibc/make.defaults b/profiles/selinux/2005.1/x86-uclibc/make.defaults
index 1b05bbbaafa1..4f550592e958 100644
--- a/profiles/selinux/2005.1/x86-uclibc/make.defaults
+++ b/profiles/selinux/2005.1/x86-uclibc/make.defaults
@@ -1,10 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86-uclibc/make.defaults,v 1.1 2005/04/02 15:48:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86-uclibc/make.defaults,v 1.2 2005/04/16 14:51:57 pebenito Exp $
 
 USE="x86 uclibc"
 GRP_STAGE23_USE="x86 uclibc"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
+
+CHOST="i386-pc-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 FEATURES=""
diff --git a/profiles/selinux/2005.1/x86/make.defaults b/profiles/selinux/2005.1/x86/make.defaults
index 94f7e5ff44ff..70e761bc4641 100644
--- a/profiles/selinux/2005.1/x86/make.defaults
+++ b/profiles/selinux/2005.1/x86/make.defaults
@@ -1,10 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86/make.defaults,v 1.1 2005/04/02 15:48:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86/make.defaults,v 1.2 2005/04/16 14:51:57 pebenito Exp $
 
 USE="x86"
 GRP_STAGE23_USE="x86"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
+
+CHOST="i686-pc-linux-gnu"
+CFLAGS="-O2 -mcpu=i686 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 #FEATURES="sandbox"