move the lib symlink profile down a dir and have the defaults match the binutils/gcc defaults

8 files changed, 23 insertions, 14 deletions

diff --git a/profiles/arch/amd64-fbsd/parent b/profiles/arch/amd64-fbsd/parent
index c5b66f7e9c9c..d8d1efff8456 100644
--- a/profiles/arch/amd64-fbsd/parent
+++ b/profiles/arch/amd64-fbsd/parent
@@ -1,2 +1,2 @@
 ../base
-../../features/multilib
+../../features/multilib/lib32
diff --git a/profiles/arch/amd64/parent b/profiles/arch/amd64/parent
index c5b66f7e9c9c..d8d1efff8456 100644
--- a/profiles/arch/amd64/parent
+++ b/profiles/arch/amd64/parent
@@ -1,2 +1,2 @@
 ../base
-../../features/multilib
+../../features/multilib/lib32
diff --git a/profiles/arch/mips/mips64/multilib/parent b/profiles/arch/mips/mips64/multilib/parent
index a5b4126260cf..ae723a79a7df 100644
--- a/profiles/arch/mips/mips64/multilib/parent
+++ b/profiles/arch/mips/mips64/multilib/parent
@@ -1,2 +1,2 @@
 ..
-../../../../features/multilib
+../../../../features/multilib/lib32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/parent b/profiles/arch/mips/mipsel/mips64el/multilib/parent
index 97dffb64c4d1..5689fbd5e174 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/parent
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../features/multilib
+../../../../../features/multilib/lib32
diff --git a/profiles/default/linux/sparc/experimental/multilib/parent b/profiles/default/linux/sparc/experimental/multilib/parent
index 88f01fd7f9e9..2b1b52267827 100644
--- a/profiles/default/linux/sparc/experimental/multilib/parent
+++ b/profiles/default/linux/sparc/experimental/multilib/parent
@@ -1,3 +1,3 @@
 ..
 ../../../../../releases/10.0
-../../../../../features/multilib
+../../../../../features/multilib/lib32
diff --git a/profiles/features/32bit-userland/parent b/profiles/features/32bit-userland/parent
index ef64da6e1d20..9b90fe9346dc 100644
--- a/profiles/features/32bit-userland/parent
+++ b/profiles/features/32bit-userland/parent
@@ -1 +1 @@
-../multilib
+../multilib/lib32
diff --git a/profiles/features/multilib/lib32/make.defaults b/profiles/features/multilib/lib32/make.defaults
new file mode 100644
index 000000000000..b2bdec6d91b6
--- /dev/null
+++ b/profiles/features/multilib/lib32/make.defaults
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/lib32/make.defaults,v 1.1 2011/03/21 04:38:27 vapier Exp $
+
+# Let baselayout create the lib symlink.
+SYMLINK_LIB="yes"
+
+# 32-bit LIBDIR
+LIBDIR_ppc="lib32"
+LIBDIR_x86="lib32"
+LIBDIR_x86_fbsd="lib32"
+LIBDIR_sparc32="lib32"
diff --git a/profiles/features/multilib/make.defaults b/profiles/features/multilib/make.defaults
index 3c4998fafe32..857ede3e2f4e 100644
--- a/profiles/features/multilib/make.defaults
+++ b/profiles/features/multilib/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.3 2009/03/12 14:30:34 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.4 2011/03/21 04:38:27 vapier Exp $
 
 # This is so we build with multilib from the start
 STAGE1_USE="multilib nptl nptlonly unicode"
@@ -10,9 +10,6 @@ MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/
 MULTILIB_STRICT_DENY="64-bit.*shared object"
 MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage)"
 
-# Let baselayout create the lib symlink.
-SYMLINK_LIB="yes"
-
 # 64-bit LIBDIR
 LIBDIR_amd64="lib64"
 LIBDIR_amd64_fbsd="lib64"
@@ -20,7 +17,7 @@ LIBDIR_ppc64="lib64"
 LIBDIR_sparc64="lib64"
 
 # 32-bit LIBDIR
-LIBDIR_ppc="lib32"
-LIBDIR_x86="lib32"
-LIBDIR_x86_fbsd="lib32"
-LIBDIR_sparc32="lib32"
+LIBDIR_ppc="lib"
+LIBDIR_x86="lib"
+LIBDIR_x86_fbsd="lib"
+LIBDIR_sparc32="lib"