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.
This commit is contained in:
Michał Górny
2017-12-05 15:38:28 +01:00
parent 4aac3db9d0
commit 6564751b2a
8 changed files with 12 additions and 10 deletions

View File

@@ -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"

View File

@@ -0,0 +1 @@
..

View File

@@ -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"

View File

@@ -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"

View File

@@ -1,3 +1,3 @@
..
../../../../arch/amd64
../../../../arch/amd64/lib32
../../../../releases/13.0

View File

@@ -1,3 +1,3 @@
..
../../../../arch/amd64
../../../../arch/amd64/lib32
../../../../releases/17.0

View File

@@ -1,2 +1,2 @@
..
../../../../arch/amd64
../../../../arch/amd64/lib32

View File

@@ -1,4 +1,4 @@
../../../base
../../../default/linux
../../../arch/amd64
../../../arch/amd64/lib32
..