diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-09 09:14:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-09 09:14:02 +0000 |
commit | b9ef7cab6264f1838672efbbcb4ba3b3abd5323f (patch) | |
tree | 38e677f4a13244ca8ed29a815a0a62f943b430d4 /profiles/arch/amd64 | |
parent | d37b97a25b8b10f748eead6574b01f893f140b01 (diff) |
gentoo resync : 09.12.2017
Diffstat (limited to 'profiles/arch/amd64')
-rw-r--r-- | profiles/arch/amd64/lib32/make.defaults | 5 | ||||
-rw-r--r-- | profiles/arch/amd64/lib32/parent | 1 | ||||
-rw-r--r-- | profiles/arch/amd64/make.defaults | 5 | ||||
-rw-r--r-- | profiles/arch/amd64/x32/make.defaults | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/profiles/arch/amd64/lib32/make.defaults b/profiles/arch/amd64/lib32/make.defaults new file mode 100644 index 000000000000..19b102e42e0e --- /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 000000000000..f3229c5b9876 --- /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 a9d2cc0549dc..1ca36a8d4f3d 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 16e4a413a4cc..ad093457f3a2 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" |