From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Fri, 31 Dec 2004 10:36:24 +0000 (+0000)
Subject: Make better use of cascading profiles.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=13b8a84cbab45c558ca0da2cfde4b7b83d4bd68c;p=gentoo.git

Make better use of cascading profiles.
---

diff --git a/profiles/default-linux/sparc/make.defaults b/profiles/default-linux/sparc/make.defaults
new file mode 100644
index 000000000000..7fa8a1be88e2
--- /dev/null
+++ b/profiles/default-linux/sparc/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/make.defaults,v 1.1 2004/12/31 10:36:24 eradicator Exp $
+
+ARCH="sparc"
+ACCEPT_KEYWORDS="${ARCH}"
diff --git a/profiles/default-linux/sparc/sparc32/2004.3/make.defaults b/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
index acb33772bc1a..ebf72b43daaf 100644
--- a/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
@@ -1,15 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2004.3/make.defaults,v 1.2 2004/12/30 12:55:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2004.3/make.defaults,v 1.3 2004/12/31 10:36:24 eradicator Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
-ARCH="sparc"
-
-PROFILE_ARCH="sparc"
-
-CHOST="sparc-unknown-linux-gnu"
-
 USE="arts berkdb bitmap-fonts crypt cups fortran f77 fbcon foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype X xv zlib"
-
-ACCEPT_KEYWORDS="sparc"
diff --git a/profiles/default-linux/sparc/sparc32/make.defaults b/profiles/default-linux/sparc/sparc32/make.defaults
new file mode 100644
index 000000000000..382059b355c5
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/make.defaults,v 1.10 2004/12/31 10:36:24 eradicator Exp $
+
+# 32bit kernel, 32bit userland
+CHOST="sparc-unknown-linux-gnu"
+PROFILE_ARCH="sparc"
+
diff --git a/profiles/default-linux/sparc/sparc64-multilib/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/make.defaults
index fe5a5807b21f..92821e5e112a 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/make.defaults
+++ b/profiles/default-linux/sparc/sparc64-multilib/make.defaults
@@ -1,12 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/make.defaults,v 1.1 2004/12/31 03:40:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/make.defaults,v 1.2 2004/12/31 10:36:24 eradicator Exp $
 
-ARCH="sparc"
-ACCEPT_KEYWORDS="${ARCH}"
-
-# Used in ebuilds for verifying multilib userland
-PROFILE_ARCH="sparc64-multilib"
-
-# We're on sparc64 machines
+# 64bit kernel, 32/64bit multilib userland 
 CHOST="sparc64-unknown-linux-gnu"
+PROFILE_ARCH="sparc64-multilib"
diff --git a/profiles/default-linux/sparc/sparc64/make.defaults b/profiles/default-linux/sparc/sparc64/make.defaults
index 7cdcebc27628..57c8442d5172 100644
--- a/profiles/default-linux/sparc/sparc64/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/make.defaults
@@ -1,12 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/make.defaults,v 1.1 2004/12/31 10:29:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/make.defaults,v 1.2 2004/12/31 10:36:24 eradicator Exp $
 
-ARCH="sparc"
-ACCEPT_KEYWORDS="${ARCH}"
-
-# Even though this is a 64bit kernel, we use a 32-bit userland (v9)
+# 64bit kernel, 32bit userland
 CHOST="sparc-unknown-linux-gnu"
+PROFILE_ARCH="sparc64"
 
 # We need sparc64 binutils for linux-headers
 CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu"