mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
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:
5
profiles/arch/amd64/lib32/make.defaults
Normal file
5
profiles/arch/amd64/lib32/make.defaults
Normal 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"
|
||||
1
profiles/arch/amd64/lib32/parent
Normal file
1
profiles/arch/amd64/lib32/parent
Normal file
@@ -0,0 +1 @@
|
||||
..
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
..
|
||||
../../../../arch/amd64
|
||||
../../../../arch/amd64/lib32
|
||||
../../../../releases/13.0
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
..
|
||||
../../../../arch/amd64
|
||||
../../../../arch/amd64/lib32
|
||||
../../../../releases/17.0
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
..
|
||||
../../../../arch/amd64
|
||||
../../../../arch/amd64/lib32
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
../../../base
|
||||
../../../default/linux
|
||||
../../../arch/amd64
|
||||
../../../arch/amd64/lib32
|
||||
..
|
||||
|
||||
Reference in New Issue
Block a user