| 1 |
commit: f9304183953c1c41715f28baa6eaa7b59443ddfb |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 2 14:17:42 2017 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 2 14:29:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9304183 |
| 7 |
|
| 8 |
prefix/linux/x86,amd64: drop redundant settings |
| 9 |
|
| 10 |
Since recent profiles cleanup we can use inherited values for: |
| 11 |
ABI |
| 12 |
ARCH |
| 13 |
CHOST |
| 14 |
DEFAULT_ABI |
| 15 |
IUSE_IMPLICIT |
| 16 |
LIBDIR_x86 |
| 17 |
LIBDIR_amd64 |
| 18 |
MULTILIB_ABIS |
| 19 |
|
| 20 |
profiles/prefix/linux/amd64/make.defaults | 11 +---------- |
| 21 |
profiles/prefix/linux/x86/make.defaults | 9 --------- |
| 22 |
2 files changed, 1 insertion(+), 19 deletions(-) |
| 23 |
|
| 24 |
diff --git a/profiles/prefix/linux/amd64/make.defaults b/profiles/prefix/linux/amd64/make.defaults |
| 25 |
index 3d476b628af..01d39d236ab 100644 |
| 26 |
--- a/profiles/prefix/linux/amd64/make.defaults |
| 27 |
+++ b/profiles/prefix/linux/amd64/make.defaults |
| 28 |
@@ -3,18 +3,9 @@ |
| 29 |
|
| 30 |
#Note: this is Gentoo Prefix specific! (13 Jul 2008, darkside) |
| 31 |
|
| 32 |
-ARCH="amd64" |
| 33 |
-CHOST="x86_64-pc-linux-gnu" |
| 34 |
# The base profile sets ACCEPT_KEYWORDS=amd64 and we don't have that in prefix. |
| 35 |
ACCEPT_KEYWORDS="-amd64 ~amd64-linux" |
| 36 |
|
| 37 |
-# We don't have lib64 in prefix so, remove it here. |
| 38 |
+# We don't have lib64 or multilib in prefix, but single ABI, so remove it here. |
| 39 |
SYMLINK_LIB="" |
| 40 |
LIBDIR_amd64="lib" |
| 41 |
- |
| 42 |
-# multilib build stuff, single ABI (no multilib) |
| 43 |
-MULTILIB_ABIS="amd64" |
| 44 |
-DEFAULT_ABI="amd64" |
| 45 |
-ABI="amd64" |
| 46 |
-IUSE_IMPLICIT="abi_x86_64" |
| 47 |
-LIBDIR_amd64="lib" |
| 48 |
|
| 49 |
diff --git a/profiles/prefix/linux/x86/make.defaults b/profiles/prefix/linux/x86/make.defaults |
| 50 |
index d64251b3f6b..8a679deb075 100644 |
| 51 |
--- a/profiles/prefix/linux/x86/make.defaults |
| 52 |
+++ b/profiles/prefix/linux/x86/make.defaults |
| 53 |
@@ -1,18 +1,9 @@ |
| 54 |
# Copyright 1999-2014 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
-ARCH="x86" |
| 58 |
-CHOST="i686-pc-linux-gnu" |
| 59 |
# The base profile sets ACCEPT_KEYWORDS=x86 and we don't have that in prefix. |
| 60 |
ACCEPT_KEYWORDS="-x86 ~x86-linux" |
| 61 |
|
| 62 |
# in case we are bootstrapping with the host compiler on an amd64 linux host: |
| 63 |
CFLAGS="${CFLAGS} -m32" |
| 64 |
CXXFLAGS="${CXXFLAGS} -m32" |
| 65 |
- |
| 66 |
-# multilib build stuff, single ABI (no multilib) |
| 67 |
-MULTILIB_ABIS="x86" |
| 68 |
-DEFAULT_ABI="x86" |
| 69 |
-ABI="x86" |
| 70 |
-IUSE_IMPLICIT="abi_x86_32" |
| 71 |
-LIBDIR_x86="lib" |
Archives