diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-01-21 17:58:16 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-02-01 13:27:10 +0100 |
| commit | 4ab0a72740a3c4bf55c479a7389d91966ebb95ea (patch) | |
| tree | 9f89ad7b82b8ab1f329d385d56ea03cad08f6f4a /profiles/arch | |
| parent | profiles: Inline features/32bit-userland (diff) | |
| download | gentoo-4ab0a72740a3c4bf55c479a7389d91966ebb95ea.tar.gz gentoo-4ab0a72740a3c4bf55c479a7389d91966ebb95ea.tar.bz2 gentoo-4ab0a72740a3c4bf55c479a7389d91966ebb95ea.zip | |
profiles: Move LIBDIR_* declarations into specific arches
Diffstat (limited to 'profiles/arch')
| -rw-r--r-- | profiles/arch/amd64/make.defaults | 2 | ||||
| -rw-r--r-- | profiles/arch/amd64/x32/make.defaults | 3 | ||||
| -rw-r--r-- | profiles/arch/amd64/x32/parent | 1 | ||||
| -rw-r--r-- | profiles/arch/arm64/make.defaults | 2 | ||||
| -rw-r--r-- | profiles/arch/powerpc/make.defaults | 3 | ||||
| -rw-r--r-- | profiles/arch/s390/make.defaults | 5 |
6 files changed, 10 insertions, 6 deletions
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults index 140fa0b6b0b6..69d09abac549 100644 --- a/profiles/arch/amd64/make.defaults +++ b/profiles/arch/amd64/make.defaults @@ -18,8 +18,10 @@ DEFAULT_ABI="amd64" # Do not remove this one, or all kinds of hell breaks loose. ABI="amd64" +LIBDIR_amd64="lib64" # TODO: move this to a deprecated subprofile LIBDIR_x86="lib32" +LIBDIR_x32="libx32" SYMLINK_LIB="yes" # 64bit specific settings. diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults index d06c616b15fa..c6c6c90d74ec 100644 --- a/profiles/arch/amd64/x32/make.defaults +++ b/profiles/arch/amd64/x32/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,6 +6,7 @@ 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) diff --git a/profiles/arch/amd64/x32/parent b/profiles/arch/amd64/x32/parent index 6ee1b9eff10c..f3229c5b9876 100644 --- a/profiles/arch/amd64/x32/parent +++ b/profiles/arch/amd64/x32/parent @@ -1,2 +1 @@ .. -../../../features/multilib diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults index 6a75c191a621..20318a45380b 100644 --- a/profiles/arch/arm64/make.defaults +++ b/profiles/arch/arm64/make.defaults @@ -12,5 +12,7 @@ CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" +LIBDIR_arm64="lib64" + # Defaults for video drivers VIDEO_CARDS="fbdev" diff --git a/profiles/arch/powerpc/make.defaults b/profiles/arch/powerpc/make.defaults deleted file mode 100644 index 445a68b5ea0f..000000000000 --- a/profiles/arch/powerpc/make.defaults +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults index aa7b92133fb3..a4076b2adfc1 100644 --- a/profiles/arch/s390/make.defaults +++ b/profiles/arch/s390/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,6 +15,9 @@ CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" +LIBDIR_s390x="lib64" +LIBDIR_s390="lib" + INPUT_DEVICES="void" VIDEO_CARDS="dummy" |