profiles: Move the SYMLINK_LIB=yes setup to a 'lib32' subprofile

Move the custom Gentoo SYMLINK_LIB=yes setup to arch/amd64/lib32
subprofile, making the top profile SYMLINK_LIB=no at the same time.
Update the inheritance tree so that all current profiles switch to
the sub-profile, and remove redundant SYMLINK_LIB=no overrides
in arch/amd64/x32 sub-profile.

diff --git a/profiles/arch/amd64/lib32/make.defaults b/profiles/arch/amd64/lib32/make.defaults
new file mode 100644 (file)
index 0000000..19b102e
--- /dev/null
+++ b/profiles/arch/amd64/lib32/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LIBDIR_x86="lib32"
+SYMLINK_LIB="yes"

diff --git a/profiles/arch/amd64/lib32/parent b/profiles/arch/amd64/lib32/parent
new file mode 100644 (file)
index 0000000..f3229c5
--- /dev/null
+++ b/profiles/arch/amd64/lib32/parent
@@ -0,0 +1 @@
+..

diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index a9d2cc0549dc669b650e3f00b7e9ee12a6e00134..1ca36a8d4f3dbfa7c8ca361e21f8fbf8134aedd5 100644 (file)
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -18,10 +18,9 @@ DEFAULT_ABI="amd64"
 ABI="amd64"
 
 LIBDIR_amd64="lib64"
-# TODO: move this to a deprecated subprofile
-LIBDIR_x86="lib32"
+LIBDIR_x86="lib"
 LIBDIR_x32="libx32"
-SYMLINK_LIB="yes"
+SYMLINK_LIB="no"
 
 # 64bit specific settings.
 CFLAGS_amd64="-m64"

diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults
index 16e4a413a4cc92da66ea7236b19fa162e8d5279b..ad093457f3a29497b6c0ec7373c4fb0328bcca33 100644 (file)
--- a/profiles/arch/amd64/x32/make.defaults
+++ b/profiles/arch/amd64/x32/make.defaults
@@ -5,9 +5,6 @@ DEFAULT_ABI="x32"
 ABI="x32"
 MULTILIB_ABIS="amd64 x86 x32"
 
-LIBDIR_x86="lib"
-SYMLINK_LIB="no"
-
 # Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
 # Default to abi_x86_x32 for packages that don't have it forced.
 ABI_X86="x32"

diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent
index c88a4211ac4e63da952c69e16bff68601b8bd610..644b98fa601f9dc90373c50e4912ab3cad2def6b 100644 (file)
--- a/profiles/default/linux/amd64/13.0/parent
+++ b/profiles/default/linux/amd64/13.0/parent
@@ -1,3 +1,3 @@
 ..
-../../../../arch/amd64
+../../../../arch/amd64/lib32
 ../../../../releases/13.0

diff --git a/profiles/default/linux/amd64/17.0/parent b/profiles/default/linux/amd64/17.0/parent
index 7d28da966e47d590e0586201aeb1de95eb31ee88..ddb69fdcdf84b40eed97aadbf11582f13b423772 100644 (file)
--- a/profiles/default/linux/amd64/17.0/parent
+++ b/profiles/default/linux/amd64/17.0/parent
@@ -1,3 +1,3 @@
 ..
-../../../../arch/amd64
+../../../../arch/amd64/lib32
 ../../../../releases/17.0

diff --git a/profiles/default/linux/amd64/dev/parent b/profiles/default/linux/amd64/dev/parent
index 9331107e9c45f7d3e1eb05f2de714e015b243089..36c90bd12373d15d0fb258f6a7a9cb08cf01d21e 100644 (file)
--- a/profiles/default/linux/amd64/dev/parent
+++ b/profiles/default/linux/amd64/dev/parent
@@ -1,2 +1,2 @@
 ..
-../../../../arch/amd64
+../../../../arch/amd64/lib32

diff --git a/profiles/hardened/linux/amd64/parent b/profiles/hardened/linux/amd64/parent
index f2e50ba2cf4e4c540f0173cb8a616414f14816ad..815cf82784f913405dfaf848a405f42e2c06c207 100644 (file)
--- a/profiles/hardened/linux/amd64/parent
+++ b/profiles/hardened/linux/amd64/parent
@@ -1,4 +1,4 @@
 ../../../base
 ../../../default/linux
-../../../arch/amd64
+../../../arch/amd64/lib32
 ..