summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-01-22 20:11:27 +0100
committerMichał Górny <mgorny@gentoo.org>2017-02-23 15:32:43 +0100
commit66b9feb7fb6fd56594f9dab7f9f5e85b8fe3cf20 (patch)
tree7629393e3487e853f7ac2ce3e0db6b85d2ccfe3b /profiles/base
parentprofiles/prefix: Add arch/base to parent (diff)
downloadgentoo-66b9feb7fb6fd56594f9dab7f9f5e85b8fe3cf20.tar.gz
gentoo-66b9feb7fb6fd56594f9dab7f9f5e85b8fe3cf20.tar.bz2
gentoo-66b9feb7fb6fd56594f9dab7f9f5e85b8fe3cf20.zip
profiles: Move ARCH-specific defaults to arch/base
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/make.defaults8
1 files changed, 3 insertions, 5 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 3d634df97d10..e8c6f3d30355 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
#
@@ -7,9 +7,7 @@
# Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
IUSE_IMPLICIT="prefix prefix-guest"
-USE_EXPAND_UNPREFIXED="ARCH"
-USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-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"
+USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND"
USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
USE_EXPAND_VALUES_USERLAND="BSD GNU"
@@ -27,7 +25,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
# Variables that are set exclusively by the profile
# and not by user configuration files.
-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"
+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"
# 'Sane' defaults
ELIBC="glibc"