From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58C29139694 for ; Thu, 23 Feb 2017 14:32:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CF4221C0E4; Thu, 23 Feb 2017 14:32:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67CC421C0E4 for ; Thu, 23 Feb 2017 14:32:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D9773414D6 for ; Thu, 23 Feb 2017 14:32:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 983DA51E5 for ; Thu, 23 Feb 2017 14:32:49 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1487860363.66b9feb7fb6fd56594f9dab7f9f5e85b8fe3cf20.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, profiles/base/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/arch/base/make.defaults profiles/base/make.defaults X-VCS-Directories: profiles/arch/base/ profiles/base/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 66b9feb7fb6fd56594f9dab7f9f5e85b8fe3cf20 X-VCS-Branch: master Date: Thu, 23 Feb 2017 14:32:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4fa4bcd1-8c31-47dc-b47e-50bc913e9d76 X-Archives-Hash: 3da2ea009bf060b45211fc9462ec56f1 commit: 66b9feb7fb6fd56594f9dab7f9f5e85b8fe3cf20 Author: Michał Górny gentoo org> AuthorDate: Sun Jan 22 19:11:27 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Feb 23 14:32:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b9feb7 profiles: Move ARCH-specific defaults to arch/base profiles/arch/base/make.defaults | 9 +++++++++ profiles/base/make.defaults | 8 +++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults new file mode 100644 index 0000000000..552931edaf --- /dev/null +++ b/profiles/arch/base/make.defaults @@ -0,0 +1,9 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +USE_EXPAND_UNPREFIXED="ARCH" +USE_EXPAND_IMPLICIT="ARCH" +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" + +PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 3d634df97d..e8c6f3d303 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"