Add some multilib vars necessary for multilib.eclass

11 files changed, 88 insertions, 7 deletions

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 891e59f28ddc..77134def291c 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.420 2014/06/12 20:06:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.421 2014/07/03 17:31:00 grobian Exp $
+
+  03 Jul 2014; Fabian Groffen <grobian@gentoo.org> aix/make.defaults,
+  +bsd/freebsd/arch/x64/make.defaults, +bsd/freebsd/arch/x86/make.defaults,
+  +darwin/macos/arch/ppc/make.defaults, +darwin/macos/arch/x64/make.defaults,
+  +darwin/macos/arch/x86/make.defaults, linux/amd64/make.defaults,
+  linux/x86/make.defaults, +sunos/solaris/arch/x64/make.defaults,
+  +sunos/solaris/arch/x86/make.defaults:
+  Add some multilib vars necessary for multilib.eclass
 
   12 Jun 2014; Fabian Groffen <grobian@gentoo.org> package.mask:
   Mask nano-2.3.3 as it fails to build with USE=-unicode, bug #512064
diff --git a/profiles/prefix/aix/make.defaults b/profiles/prefix/aix/make.defaults
index b8cb99e38bd8..c804d3a1d0e7 100644
--- a/profiles/prefix/aix/make.defaults
+++ b/profiles/prefix/aix/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/make.defaults,v 1.2 2009/06/30 16:34:58 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/make.defaults,v 1.3 2014/07/03 17:31:00 grobian Exp $
 
 # System-wide defaults for all AIX profiles
 # This file should rarely need to be changed
@@ -11,3 +11,8 @@ KERNEL="AIX"
 
 # no scanelf
 FEATURES="nostrip"
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="ppc"
+DEFAULT_ABI="ppc"
+ABI="ppc"
diff --git a/profiles/prefix/bsd/freebsd/arch/x64/make.defaults b/profiles/prefix/bsd/freebsd/arch/x64/make.defaults
new file mode 100644
index 000000000000..4980bff539b2
--- /dev/null
+++ b/profiles/prefix/bsd/freebsd/arch/x64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/arch/x64/make.defaults,v 1.1 2014/07/03 17:31:00 grobian Exp $
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="amd64"
+DEFAULT_ABI="amd64"
+ABI="amd64"
diff --git a/profiles/prefix/bsd/freebsd/arch/x86/make.defaults b/profiles/prefix/bsd/freebsd/arch/x86/make.defaults
new file mode 100644
index 000000000000..08b6e87bf8c7
--- /dev/null
+++ b/profiles/prefix/bsd/freebsd/arch/x86/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/arch/x86/make.defaults,v 1.1 2014/07/03 17:31:00 grobian Exp $
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="x86"
+DEFAULT_ABI="x86"
+ABI="x86"
diff --git a/profiles/prefix/darwin/macos/arch/ppc/make.defaults b/profiles/prefix/darwin/macos/arch/ppc/make.defaults
new file mode 100644
index 000000000000..79c2632675db
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/ppc/make.defaults,v 1.1 2014/07/03 17:31:01 grobian Exp $
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="ppc"
+DEFAULT_ABI="ppc"
+ABI="ppc"
diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults
new file mode 100644
index 000000000000..d1eace90a404
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/x64/make.defaults,v 1.1 2014/07/03 17:31:01 grobian Exp $
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="amd64"
+DEFAULT_ABI="amd64"
+ABI="amd64"
diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults b/profiles/prefix/darwin/macos/arch/x86/make.defaults
new file mode 100644
index 000000000000..b64be730dc8b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/x86/make.defaults,v 1.1 2014/07/03 17:31:01 grobian Exp $
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="x86"
+DEFAULT_ABI="x86"
+ABI="x86"
diff --git a/profiles/prefix/linux/amd64/make.defaults b/profiles/prefix/linux/amd64/make.defaults
index 8f56a170d7c2..b7bc0f60cce7 100644
--- a/profiles/prefix/linux/amd64/make.defaults
+++ b/profiles/prefix/linux/amd64/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/amd64/make.defaults,v 1.3 2013/06/06 01:53:18 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/amd64/make.defaults,v 1.4 2014/07/03 17:31:01 grobian Exp $
 
 #Note: this is Gentoo Prefix specific! (13 Jul 2008, darkside)
 
@@ -12,3 +12,8 @@ ACCEPT_KEYWORDS="-amd64 ~amd64-linux"
 # We don't have lib64 in prefix so, remove it here.
 SYMLINK_LIB=""
 LIBDIR_amd64="lib"
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="amd64"
+DEFAULT_ABI="amd64"
+ABI="amd64"
diff --git a/profiles/prefix/linux/x86/make.defaults b/profiles/prefix/linux/x86/make.defaults
index 8b8de84a9add..e1783ac3e74d 100644
--- a/profiles/prefix/linux/x86/make.defaults
+++ b/profiles/prefix/linux/x86/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/x86/make.defaults,v 1.3 2009/11/04 13:25:03 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/x86/make.defaults,v 1.4 2014/07/03 17:31:01 grobian Exp $
 
 ARCH="x86"
 CHOST="i686-pc-linux-gnu"
@@ -10,3 +10,8 @@ ACCEPT_KEYWORDS="-x86 ~x86-linux"
 # in case we are bootstrapping with the host compiler on an amd64 linux host:
 CFLAGS="${CFLAGS} -m32"
 CXXFLAGS="${CXXFLAGS} -m32"
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="x86"
+DEFAULT_ABI="x86"
+ABI="x86"
diff --git a/profiles/prefix/sunos/solaris/arch/x64/make.defaults b/profiles/prefix/sunos/solaris/arch/x64/make.defaults
new file mode 100644
index 000000000000..0c5bba2080d1
--- /dev/null
+++ b/profiles/prefix/sunos/solaris/arch/x64/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/arch/x64/make.defaults,v 1.1 2014/07/03 17:31:01 grobian Exp $
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="amd64"
+DEFAULT_ABI="amd64"
+ABI="amd64"
+
diff --git a/profiles/prefix/sunos/solaris/arch/x86/make.defaults b/profiles/prefix/sunos/solaris/arch/x86/make.defaults
new file mode 100644
index 000000000000..3530b5461e05
--- /dev/null
+++ b/profiles/prefix/sunos/solaris/arch/x86/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/arch/x86/make.defaults,v 1.1 2014/07/03 17:31:02 grobian Exp $
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="x86"
+DEFAULT_ABI="x86"
+ABI="x86"
+