Add multilib/n{32,64} subprofiles to specify default ABI for multilib installations

16 files changed, 41 insertions, 4 deletions

diff --git a/profiles/arch/mips/ChangeLog b/profiles/arch/mips/ChangeLog
index 074c28861eb8..7e2623105a4b 100644
--- a/profiles/arch/mips/ChangeLog
+++ b/profiles/arch/mips/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for Gentoo/MIPS profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.56 2011/05/20 19:17:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.57 2011/06/07 19:30:53 mattst88 Exp $
+
+  07 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  +mips64/multilib/n32/make.defaults, +mips64/multilib/n32/parent,
+  +mips64/multilib/n64/make.defaults, +mips64/multilib/n64/parent,
+  +mipsel/mips64el/multilib/n32/make.defaults,
+  +mipsel/mips64el/multilib/n32/parent,
+  +mipsel/mips64el/multilib/n64/make.defaults,
+  +mipsel/mips64el/multilib/n64/parent, mips64/multilib/make.defaults,
+  mips64/multilib/parent, mipsel/mips64el/multilib/make.defaults:
+  Add multilib/n{32,64} subprofiles to specify default ABI for multilib
+  installations.
 
   20 May 2011; Kacper Kowalik <xarthisius@gentoo.org> package.use.mask:
   Mask net-nds/ypbind[debug] as dev-libs/dmalloc is not keyworded
diff --git a/profiles/arch/mips/mips64/multilib/make.defaults b/profiles/arch/mips/mips64/multilib/make.defaults
index 83a9e6a3a067..ec0633fd3ad7 100644
--- a/profiles/arch/mips/mips64/multilib/make.defaults
+++ b/profiles/arch/mips/mips64/multilib/make.defaults
@@ -17,4 +17,5 @@ CHOST_n64=${CHOST}
 LIBDIR_n64="lib64"
 
 MULTILIB_ABIS="n64 n32 o32"
-DEFAULT_ABI="n32"
+DEFAULT_ABI="o32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n32/make.defaults b/profiles/arch/mips/mips64/multilib/n32/make.defaults
new file mode 100644
index 000000000000..ca326cc3ae00
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n64 o32 n32"
+DEFAULT_ABI="n32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n32/parent b/profiles/arch/mips/mips64/multilib/n32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mips64/multilib/n64/make.defaults b/profiles/arch/mips/mips64/multilib/n64/make.defaults
new file mode 100644
index 000000000000..6b5747921597
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n64/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n32 o32 n64"
+DEFAULT_ABI="n64"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n64/parent b/profiles/arch/mips/mips64/multilib/n64/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n64/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mips64/multilib/parent b/profiles/arch/mips/mips64/multilib/parent
index ae723a79a7df..a5b4126260cf 100644
--- a/profiles/arch/mips/mips64/multilib/parent
+++ b/profiles/arch/mips/mips64/multilib/parent
@@ -1,2 +1,2 @@
 ..
-../../../../features/multilib/lib32
+../../../../features/multilib
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults
index 690e58965151..88575eda346f 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults
@@ -17,4 +17,5 @@ CHOST_n64=${CHOST}
 LIBDIR_n64="lib64"
 
 MULTILIB_ABIS="n64 n32 o32"
-DEFAULT_ABI="n32"
+DEFAULT_ABI="o32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n32/make.defaults
new file mode 100644
index 000000000000..ca326cc3ae00
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n64 o32 n32"
+DEFAULT_ABI="n32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n64/make.defaults
new file mode 100644
index 000000000000..6b5747921597
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n32 o32 n64"
+DEFAULT_ABI="n64"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n64/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/mips/10.0/mipsel/multilib/n32/parent b/profiles/default/linux/mips/10.0/mipsel/multilib/n32/parent
new file mode 100644
index 000000000000..abb7e2ce4434
--- /dev/null
+++ b/profiles/default/linux/mips/10.0/mipsel/multilib/n32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../arch/mips/mipsel/mips64el/multilib/n32/
diff --git a/profiles/default/linux/mips/10.0/mipsel/multilib/n64/parent b/profiles/default/linux/mips/10.0/mipsel/multilib/n64/parent
new file mode 100644
index 000000000000..14ec26d711a1
--- /dev/null
+++ b/profiles/default/linux/mips/10.0/mipsel/multilib/n64/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../arch/mips/mipsel/mips64el/multilib/n64/
diff --git a/profiles/default/linux/mips/10.0/multilib/n32/parent b/profiles/default/linux/mips/10.0/multilib/n32/parent
new file mode 100644
index 000000000000..c48bd8858ef8
--- /dev/null
+++ b/profiles/default/linux/mips/10.0/multilib/n32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../arch/mips/mips64/multilib/n32
diff --git a/profiles/default/linux/mips/10.0/multilib/n64/parent b/profiles/default/linux/mips/10.0/multilib/n64/parent
new file mode 100644
index 000000000000..c77705fe7e43
--- /dev/null
+++ b/profiles/default/linux/mips/10.0/multilib/n64/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../arch/mips/mips64/multilib/n64