Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 2/4] profiles: Move ARCH-specific defaults to arch/base
Date: Mon, 13 Feb 2017 14:42:53
Message-Id: 20170213144050.20756-3-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH] Profile cleanup, pt. 3: arch/base by "Michał Górny"
1 ---
2 profiles/arch/base/make.defaults | 9 +++++++++
3 profiles/base/make.defaults | 8 +++-----
4 2 files changed, 12 insertions(+), 5 deletions(-)
5 create mode 100644 profiles/arch/base/make.defaults
6
7 diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
8 new file mode 100644
9 index 000000000000..552931edaff1
10 --- /dev/null
11 +++ b/profiles/arch/base/make.defaults
12 @@ -0,0 +1,9 @@
13 +# Copyright 1999-2017 Gentoo Foundation
14 +# Distributed under the terms of the GNU General Public License v2
15 +# $Id$
16 +
17 +USE_EXPAND_UNPREFIXED="ARCH"
18 +USE_EXPAND_IMPLICIT="ARCH"
19 +USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
20 +
21 +PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
22 diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
23 index 3d634df97d10..e8c6f3d30355 100644
24 --- a/profiles/base/make.defaults
25 +++ b/profiles/base/make.defaults
26 @@ -1,4 +1,4 @@
27 -# Copyright 1999-2016 Gentoo Foundation
28 +# Copyright 1999-2017 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 # $Id$
31 #
32 @@ -7,9 +7,7 @@
33
34 # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
35 IUSE_IMPLICIT="prefix prefix-guest"
36 -USE_EXPAND_UNPREFIXED="ARCH"
37 -USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
38 -USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
39 +USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND"
40 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
41 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
42 USE_EXPAND_VALUES_USERLAND="BSD GNU"
43 @@ -27,7 +25,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
44
45 # Variables that are set exclusively by the profile
46 # and not by user configuration files.
47 -PROFILE_ONLY_VARIABLES="ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
48 +PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
49
50 # 'Sane' defaults
51 ELIBC="glibc"
52 --
53 2.11.1