commit: 74c1593b105fe120798e1a3730437082a34ac53e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jan 21 13:21:16 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Feb 1 12:27:08 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c1593b
profiles: Inline features/multilib/lib32 NFC except for effective LIBDIR_* for architectures irrelevant to the profile at hand. profiles/arch/amd64-fbsd/make.defaults | 1 + profiles/arch/amd64-fbsd/parent | 2 +- profiles/arch/amd64/make.defaults | 4 ++++ profiles/arch/amd64/parent | 2 +- .../default/linux/sparc/experimental/multilib/make.defaults | 4 +++- profiles/default/linux/sparc/experimental/multilib/parent | 2 +- profiles/features/multilib/lib32/eapi | 1 - profiles/features/multilib/lib32/make.defaults | 13 ------------- profiles/features/multilib/lib32/parent | 1 - 9 files changed, 11 insertions(+), 19 deletions(-) diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults index 432f774..36e84de2 100644 --- a/profiles/arch/amd64-fbsd/make.defaults +++ b/profiles/arch/amd64-fbsd/make.defaults @@ -31,6 +31,7 @@ VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \ # distros. # Adjust multilib dirs for multilib-strict. LIBDIR_amd64_fbsd="lib" +LIBDIR_x86_fbsd="lib32" MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X11R6/lib32" SYMLINK_LIB="no" diff --git a/profiles/arch/amd64-fbsd/parent b/profiles/arch/amd64-fbsd/parent index db3aa68..014611b 100644 --- a/profiles/arch/amd64-fbsd/parent +++ b/profiles/arch/amd64-fbsd/parent @@ -1,3 +1,3 @@ ../base -../../features/multilib/lib32 +../../features/multilib todo diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults index df7976d..140fa0b 100644 --- a/profiles/arch/amd64/make.defaults +++ b/profiles/arch/amd64/make.defaults @@ -18,6 +18,10 @@ DEFAULT_ABI="amd64" # Do not remove this one, or all kinds of hell breaks loose. ABI="amd64" +# TODO: move this to a deprecated subprofile +LIBDIR_x86="lib32" +SYMLINK_LIB="yes" + # 64bit specific settings. CFLAGS_amd64="-m64" LDFLAGS_amd64="-m elf_x86_64" diff --git a/profiles/arch/amd64/parent b/profiles/arch/amd64/parent index d8d1eff..c5b66f7 100644 --- a/profiles/arch/amd64/parent +++ b/profiles/arch/amd64/parent @@ -1,2 +1,2 @@ ../base -../../features/multilib/lib32 +../../features/multilib diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults index e7aebfd..c8bad62 100644 --- a/profiles/default/linux/sparc/experimental/multilib/make.defaults +++ b/profiles/default/linux/sparc/experimental/multilib/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,3 +11,5 @@ FEATURES="userpriv" # can't set this in the top level make.defaults as it breaks # sys-kernel/linux-headers for non-multilib profiles CFLAGS_sparc64="-m64" + +LIBDIR_sparc32="lib32" diff --git a/profiles/default/linux/sparc/experimental/multilib/parent b/profiles/default/linux/sparc/experimental/multilib/parent index 7607023..04ec01c 100644 --- a/profiles/default/linux/sparc/experimental/multilib/parent +++ b/profiles/default/linux/sparc/experimental/multilib/parent @@ -1,3 +1,3 @@ .. ../../../../../releases/13.0 -../../../../../features/multilib/lib32 +../../../../../features/multilib diff --git a/profiles/features/multilib/lib32/eapi b/profiles/features/multilib/lib32/eapi deleted file mode 100644 index 7ed6ff8..00000000 --- a/profiles/features/multilib/lib32/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/features/multilib/lib32/make.defaults b/profiles/features/multilib/lib32/make.defaults deleted file mode 100644 index b3ab33c..00000000 --- a/profiles/features/multilib/lib32/make.defaults +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Let baselayout create the lib symlink. -SYMLINK_LIB="yes" - -# 32-bit LIBDIR -LIBDIR_ppc="lib32" -LIBDIR_x86="lib32" -LIBDIR_x86_fbsd="lib32" -LIBDIR_sparc32="lib32" -LIBDIR_s390="lib32" diff --git a/profiles/features/multilib/lib32/parent b/profiles/features/multilib/lib32/parent deleted file mode 100644 index f3229c5b..00000000 --- a/profiles/features/multilib/lib32/parent +++ /dev/null @@ -1 +0,0 @@ -..
