[gentoo-commits] repo/gentoo:master commit in: profiles/hardened/linux/amd64/, profiles/arch/amd64/lib32/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/hardened/linux/amd64/, profiles/arch/amd64/lib32/, ...

[Michał Górny]

commit:     6564751b2aefe115338eceaaeff1ea4505879395
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 14:38:28 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 14:15:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6564751b

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.

 profiles/arch/amd64/lib32/make.defaults  | 5 +++++
 profiles/arch/amd64/lib32/parent         | 1 +
 profiles/arch/amd64/make.defaults        | 5 ++---
 profiles/arch/amd64/x32/make.defaults    | 3 ---
 profiles/default/linux/amd64/13.0/parent | 2 +-
 profiles/default/linux/amd64/17.0/parent | 2 +-
 profiles/default/linux/amd64/dev/parent  | 2 +-
 profiles/hardened/linux/amd64/parent     | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/profiles/arch/amd64/lib32/make.defaults b/profiles/arch/amd64/lib32/make.defaults
new file mode 100644
index 00000000000..19b102e42e0
--- /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
index 00000000000..f3229c5b987
--- /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 a9d2cc0549d..1ca36a8d4f3 100644
--- 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 16e4a413a4c..ad093457f3a 100644
--- 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 c88a4211ac4..644b98fa601 100644
--- 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 7d28da966e4..ddb69fdcdf8 100644
--- 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 9331107e9c4..36c90bd1237 100644
--- 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 f2e50ba2cf4..815cf82784f 100644
--- a/profiles/hardened/linux/amd64/parent
+++ b/profiles/hardened/linux/amd64/parent
@@ -1,4 +1,4 @@
 ../../../base
 ../../../default/linux
-../../../arch/amd64
+../../../arch/amd64/lib32
 ..