Skip to content

Commit

Permalink
profiles: Move the SYMLINK_LIB=yes setup to a 'lib32' subprofile
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mgorny committed Dec 8, 2017
1 parent 4aac3db commit 6564751
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 10 deletions.
5 changes: 5 additions & 0 deletions profiles/arch/amd64/lib32/make.defaults
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions profiles/arch/amd64/lib32/parent
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
..
5 changes: 2 additions & 3 deletions profiles/arch/amd64/make.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions profiles/arch/amd64/x32/make.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ DEFAULT_ABI="x32"
ABI="x32"
MULTILIB_ABIS="amd64 x86 x32"

LIBDIR_x86="lib"
SYMLINK_LIB="no"

# Michał Górny <[email protected]> (01 Jul 2014)
# Default to abi_x86_x32 for packages that don't have it forced.
ABI_X86="x32"
Expand Down
2 changes: 1 addition & 1 deletion profiles/default/linux/amd64/13.0/parent
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
..
../../../../arch/amd64
../../../../arch/amd64/lib32
../../../../releases/13.0
2 changes: 1 addition & 1 deletion profiles/default/linux/amd64/17.0/parent
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
..
../../../../arch/amd64
../../../../arch/amd64/lib32
../../../../releases/17.0
2 changes: 1 addition & 1 deletion profiles/default/linux/amd64/dev/parent
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
..
../../../../arch/amd64
../../../../arch/amd64/lib32
2 changes: 1 addition & 1 deletion profiles/hardened/linux/amd64/parent
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
../../../base
../../../default/linux
../../../arch/amd64
../../../arch/amd64/lib32
..

0 comments on commit 6564751

Please sign in to comment.