[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux/amd64/

[Fabian Groffen]

commit: b0445c0a8dd6d2f792c5bb088b154aca53868353
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov  7 11:48:57 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov  7 11:50:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0445c0a

profiles/prefix/linux/amd64: switch parent to 17.1 amd64 profile

This change only affects host-style Prefix on Linux, e.g. non-RAP.

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/linux/amd64/parent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/linux/amd64/parent 
b/profiles/prefix/linux/amd64/parent
index 0d2c53ad27f..c8d63be093b 100644
--- a/profiles/prefix/linux/amd64/parent
+++ b/profiles/prefix/linux/amd64/parent
@@ -1,2 +1,2 @@
-../../../default/linux/amd64/17.0/no-multilib
+../../../default/linux/amd64/17.1/no-multilib
 ..

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux/amd64/, profiles/prefix/linux/x86/

[Michael Haubenwallner]

commit: f9304183953c1c41715f28baa6eaa7b59443ddfb
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Thu Mar  2 14:17:42 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Mar  2 14:29:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9304183

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

 profiles/prefix/linux/amd64/make.defaults | 11 +--
 profiles/prefix/linux/x86/make.defaults   |  9 -
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/profiles/prefix/linux/amd64/make.defaults 
b/profiles/prefix/linux/amd64/make.defaults
index 3d476b628af..01d39d236ab 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 d64251b3f6b..8a679deb075 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"