move arch-specific stuff out of make.globals and into profiles #89181

15 files changed, 71 insertions, 43 deletions

diff --git a/profiles/default-linux/alpha/make.defaults b/profiles/default-linux/alpha/make.defaults
index 90ef02e6e300..3231ef5fe2fd 100644
--- a/profiles/default-linux/alpha/make.defaults
+++ b/profiles/default-linux/alpha/make.defaults
@@ -1,9 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/make.defaults,v 1.2 2005/03/09 00:35:06 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/make.defaults,v 1.3 2005/04/16 08:17:37 vapier Exp $
+
+ARCH="alpha"
+ACCEPT_KEYWORDS="alpha"
+
+CHOST="alpha-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
@@ -65,6 +69,3 @@ xmms
 xv
 zlib
 "
-
-ARCH="alpha"
-ACCEPT_KEYWORDS="alpha"
diff --git a/profiles/default-linux/arm/make.defaults b/profiles/default-linux/arm/make.defaults
index 432868bb1ad4..48b4f81eb328 100644
--- a/profiles/default-linux/arm/make.defaults
+++ b/profiles/default-linux/arm/make.defaults
@@ -1,10 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/make.defaults,v 1.3 2005/03/05 16:49:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/make.defaults,v 1.4 2005/04/16 08:17:37 vapier Exp $
 
 ARCH="arm"
 ACCEPT_KEYWORDS="arm"
 
+CHOST="arm-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 FEATURES="sfperms"
 
 GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd"
diff --git a/profiles/default-linux/hppa/make.defaults b/profiles/default-linux/hppa/make.defaults
index cef9e9f7548d..f83f1705f6b2 100644
--- a/profiles/default-linux/hppa/make.defaults
+++ b/profiles/default-linux/hppa/make.defaults
@@ -1,15 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/make.defaults,v 1.3 2005/03/09 00:35:06 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-# System-wide defaults for the Portage system
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/make.defaults,v 1.4 2005/04/16 08:17:38 vapier Exp $
 
 ARCH="hppa"
 ACCEPT_KEYWORDS="hppa"
 
+CHOST="hppa-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="-O1 -pipe"
+
 FEATURES="sandbox sfperms strict"
 
 USE="berkdb crypt cups foomaticdb fortran gdbm gpm imlib ipv6 libwww ncurses nls pam perl pic python readline spell ssl tcpd xml2 zlib"
diff --git a/profiles/default-linux/ia64/make.defaults b/profiles/default-linux/ia64/make.defaults
index 78a8fb3e4fa1..f83ee0b08c86 100644
--- a/profiles/default-linux/ia64/make.defaults
+++ b/profiles/default-linux/ia64/make.defaults
@@ -1,11 +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/ia64/make.defaults,v 1.1 2005/01/21 15:31:28 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/make.defaults,v 1.2 2005/04/16 08:17:38 vapier Exp $
 
 ARCH="ia64"
 ACCEPT_KEYWORDS="ia64"
 
+CHOST="ia64-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/m68k/make.defaults b/profiles/default-linux/m68k/make.defaults
index 0095d590e8dc..c2b4c61f0240 100644
--- a/profiles/default-linux/m68k/make.defaults
+++ b/profiles/default-linux/m68k/make.defaults
@@ -1,15 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/m68k/make.defaults,v 1.2 2005/03/05 17:01:59 wolf31o2 Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-USE="crypt ncurses readline ssl zlib"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/m68k/make.defaults,v 1.3 2005/04/16 08:17:38 vapier Exp $
 
 ARCH="m68k"
 ACCEPT_KEYWORDS="m68k"
 
+CHOST="m68k-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 FEATURES="-sandbox sfperms"
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+
+USE="crypt ncurses readline ssl zlib"
diff --git a/profiles/default-linux/s390/make.defaults b/profiles/default-linux/s390/make.defaults
index 4431cee62dbd..7c4f86b3b8bf 100644
--- a/profiles/default-linux/s390/make.defaults
+++ b/profiles/default-linux/s390/make.defaults
@@ -1,11 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/make.defaults,v 1.2 2005/03/09 00:35:07 vapier Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/make.defaults,v 1.3 2005/04/16 08:17:38 vapier Exp $
 
 ARCH="s390"
+ACCEPT_KEYWORDS="s390"
 
-USE="berkdb bitmap-fonts crypt cups fortran fbcon font-server foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline spell ssl tcpd truetype truetype-fonts type1-fonts zlib"
+CHOST="s390-ibm-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
 
-ACCEPT_KEYWORDS="s390"
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+
+USE="berkdb bitmap-fonts crypt cups fortran fbcon font-server foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline spell ssl tcpd truetype truetype-fonts type1-fonts zlib"
diff --git a/profiles/default-linux/sh/make.defaults b/profiles/default-linux/sh/make.defaults
index 3fa7930e4f1a..61aba00562f9 100644
--- a/profiles/default-linux/sh/make.defaults
+++ b/profiles/default-linux/sh/make.defaults
@@ -1,14 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sh/make.defaults,v 1.3 2005/01/21 15:32:50 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-USE="${GRP_STAGE23_USE} crypt zlib"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sh/make.defaults,v 1.4 2005/04/16 08:17:38 vapier Exp $
 
 ARCH="sh"
 ACCEPT_KEYWORDS="sh"
 
+CHOST="sh-unknown-linux-gnu"
+CFLAGS="-O2"
+CXXFLAGS="${CFLAGS}"
+
 FEATURES="-sandbox sfperms"
+
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+USE="${GRP_STAGE23_USE} crypt zlib"
diff --git a/profiles/default-linux/x86/make.defaults b/profiles/default-linux/x86/make.defaults
index b779e4ccdfaa..17f3caa01140 100644
--- a/profiles/default-linux/x86/make.defaults
+++ b/profiles/default-linux/x86/make.defaults
@@ -1,12 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/make.defaults,v 1.6 2005/03/29 16:54:47 wolf31o2 Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-
-USE="alsa apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran foomaticdb gdbm gif gnome gpm gtk gtk2 imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls oggvorbis opengl oss pam pdflib perl png python qt quicktime readline sdl spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/make.defaults,v 1.7 2005/04/16 08:17:38 vapier Exp $
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
 
+CHOST="i686-pc-linux-gnu"
+CFLAGS="-O2 -mcpu=i686 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 FEATURES="sandbox sfperms"
+
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+
+USE="alsa apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran foomaticdb gdbm gif gnome gpm gtk gtk2 imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls oggvorbis opengl oss pam pdflib perl png python qt quicktime readline sdl spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
diff --git a/profiles/uclibc/arm/make.defaults b/profiles/uclibc/arm/make.defaults
index 92e82b2f56cf..959f42aa8e43 100644
--- a/profiles/uclibc/arm/make.defaults
+++ b/profiles/uclibc/arm/make.defaults
@@ -1,4 +1,6 @@
 ARCH="arm"
 ACCEPT_KEYWORDS="arm"
 
+CHOST="arm-gentoo-linux-uclibc"
+
 UCLIBC_CPU_DEFAULT="GENERIC_ARM"
diff --git a/profiles/uclibc/make.defaults b/profiles/uclibc/make.defaults
index 3c506f47a1e5..1b0aada23992 100644
--- a/profiles/uclibc/make.defaults
+++ b/profiles/uclibc/make.defaults
@@ -2,6 +2,9 @@ STAGE1_USE="uclibc"
 GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc"
 USE="berkdb ncurses readline zlib uclibc"
 
+CFLAGS="-Os"
+CXXFLAGS="${CFLAGS}"
+
 PORTAGE_LIBC="uClibc"
 
 # 
diff --git a/profiles/uclibc/mips/make.defaults b/profiles/uclibc/mips/make.defaults
index 7ea29454bacf..db900e367bf1 100644
--- a/profiles/uclibc/mips/make.defaults
+++ b/profiles/uclibc/mips/make.defaults
@@ -1,6 +1,8 @@
 ARCH="mips"
 ACCEPT_KEYWORDS="mips"
 
+CHOST="mips-gentoo-linux-uclibc"
+
 FEATURES="-sandbox"
 
 UCLIBC_CPU_DEFAULT="MIPS_ISA_1"
diff --git a/profiles/uclibc/mips/mipsel/make.defaults b/profiles/uclibc/mips/mipsel/make.defaults
index e69de29bb2d1..80b70299abe4 100644
--- a/profiles/uclibc/mips/mipsel/make.defaults
+++ b/profiles/uclibc/mips/mipsel/make.defaults
@@ -0,0 +1 @@
+CHOST="mipsel-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/ppc/make.defaults b/profiles/uclibc/ppc/make.defaults
index d63e113ec638..0514ca71084a 100644
--- a/profiles/uclibc/ppc/make.defaults
+++ b/profiles/uclibc/ppc/make.defaults
@@ -1,4 +1,6 @@
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
+CHOST="powerpc-gentoo-linux-uclibc"
+
 UCLIBC_CPU_DEFAULT=""
diff --git a/profiles/uclibc/sh/make.defaults b/profiles/uclibc/sh/make.defaults
index de37277f5260..b3684a0b2658 100644
--- a/profiles/uclibc/sh/make.defaults
+++ b/profiles/uclibc/sh/make.defaults
@@ -1,4 +1,6 @@
 ARCH="sh"
 ACCEPT_KEYWORDS="sh"
 
+CHOST="sh-gentoo-linux-uclibc"
+
 UCLIBC_CPU_DEFAULT="SH4"
diff --git a/profiles/uclibc/x86/make.defaults b/profiles/uclibc/x86/make.defaults
index 48df663eb981..0b41209d6fc9 100644
--- a/profiles/uclibc/x86/make.defaults
+++ b/profiles/uclibc/x86/make.defaults
@@ -1,4 +1,6 @@
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
 
+CHOST="i386-gentoo-linux-uclibc"
+
 UCLIBC_CPU_DEFAULT="GENERIC_386"