Moving ABI=amd64 to the base of the arch, since it applies to all profiles except for 32-bit userland, which can set it on its own.

3 files changed, 13 insertions, 5 deletions

diff --git a/profiles/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog
index 285ab2f633db..eed35be530c3 100644
--- a/profiles/default-linux/amd64/ChangeLog
+++ b/profiles/default-linux/amd64/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.130 2008/02/01 06:40:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.131 2008/02/02 06:11:44 wolf31o2 Exp $
+
+  02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  dev/2008.0/make.defaults, make.defaults:
+  Moving ABI=amd64 to the base of the arch, since it applies to all profiles
+  except for 32-bit userland, which can set it on its own.
 
   01 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   dev/2008.0/make.defaults, profile.bashrc:
diff --git a/profiles/default-linux/amd64/dev/2008.0/make.defaults b/profiles/default-linux/amd64/dev/2008.0/make.defaults
index fa7ec06c1124..8f1807808fcd 100644
--- a/profiles/default-linux/amd64/dev/2008.0/make.defaults
+++ b/profiles/default-linux/amd64/dev/2008.0/make.defaults
@@ -1,8 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2008.0/make.defaults,v 1.2 2008/02/01 06:40:23 wolf31o2 Exp $
-
-ABI="amd64"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2008.0/make.defaults,v 1.3 2008/02/02 06:11:44 wolf31o2 Exp $
 
 # We build stage1 against this
 STAGE1_USE="nptl nptlonly unicode"
@@ -10,3 +8,6 @@ STAGE1_USE="nptl nptlonly unicode"
 # These USE flags are what is common between the various sub-profiles. Stages 2
 # and 3 are built against these, so be careful what you add.
 USE="acl cups gdbm gpm nptl nptlonly unicode"
+
+# These are here for app-accessibility/brltty on the releases
+# USE="${USE} bluetooth usb"
diff --git a/profiles/default-linux/amd64/make.defaults b/profiles/default-linux/amd64/make.defaults
index 358dd16bef85..2766d8eb25de 100644
--- a/profiles/default-linux/amd64/make.defaults
+++ b/profiles/default-linux/amd64/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.27 2007/06/12 20:31:01 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.28 2008/02/02 06:11:44 wolf31o2 Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -21,6 +21,8 @@ USE="${USE} mmx sse sse2"
 # Multilib settings for all amd64 subprofiles.
 MULTILIB_ABIS="amd64 x86"
 DEFAULT_ABI="amd64"
+# Do not remove this one, or all kinds of hell breaks loose.
+ABI="amd64"
 
 # 64bit specific settings.
 CHOST_amd64="x86_64-pc-linux-gnu"