diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2017-03-02 15:17:42 +0100 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2017-03-02 15:29:02 +0100 |
| commit | f9304183953c1c41715f28baa6eaa7b59443ddfb (patch) | |
| tree | 598cb80e2d21424252e69e7243fc8b5e35b67b45 | |
| parent | dev-db/percona-toolkit: Bump to v2.2.20 (diff) | |
| download | gentoo-f9304183953c1c41715f28baa6eaa7b59443ddfb.tar.gz gentoo-f9304183953c1c41715f28baa6eaa7b59443ddfb.tar.bz2 gentoo-f9304183953c1c41715f28baa6eaa7b59443ddfb.zip | |
prefix/linux/x86,amd64: drop redundant settings
Since recent profiles cleanup we can use inherited values for:
ABI
ARCH
CHOST
DEFAULT_ABI
IUSE_IMPLICIT
LIBDIR_x86
LIBDIR_amd64
MULTILIB_ABIS
| -rw-r--r-- | profiles/prefix/linux/amd64/make.defaults | 11 | ||||
| -rw-r--r-- | profiles/prefix/linux/x86/make.defaults | 9 |
2 files changed, 1 insertions, 19 deletions
diff --git a/profiles/prefix/linux/amd64/make.defaults b/profiles/prefix/linux/amd64/make.defaults index 3d476b628afd..01d39d236ab9 100644 --- a/profiles/prefix/linux/amd64/make.defaults +++ b/profiles/prefix/linux/amd64/make.defaults @@ -3,18 +3,9 @@ #Note: this is Gentoo Prefix specific! (13 Jul 2008, darkside) -ARCH="amd64" -CHOST="x86_64-pc-linux-gnu" # The base profile sets ACCEPT_KEYWORDS=amd64 and we don't have that in prefix. ACCEPT_KEYWORDS="-amd64 ~amd64-linux" -# We don't have lib64 in prefix so, remove it here. +# We don't have lib64 or multilib in prefix, but single ABI, so remove it here. SYMLINK_LIB="" LIBDIR_amd64="lib" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="amd64" -DEFAULT_ABI="amd64" -ABI="amd64" -IUSE_IMPLICIT="abi_x86_64" -LIBDIR_amd64="lib" diff --git a/profiles/prefix/linux/x86/make.defaults b/profiles/prefix/linux/x86/make.defaults index d64251b3f6bf..8a679deb0752 100644 --- a/profiles/prefix/linux/x86/make.defaults +++ b/profiles/prefix/linux/x86/make.defaults @@ -1,18 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -ARCH="x86" -CHOST="i686-pc-linux-gnu" # The base profile sets ACCEPT_KEYWORDS=x86 and we don't have that in prefix. ACCEPT_KEYWORDS="-x86 ~x86-linux" # in case we are bootstrapping with the host compiler on an amd64 linux host: CFLAGS="${CFLAGS} -m32" CXXFLAGS="${CXXFLAGS} -m32" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="x86" -DEFAULT_ABI="x86" -ABI="x86" -IUSE_IMPLICIT="abi_x86_32" -LIBDIR_x86="lib" |