diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-25 08:18:42 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-25 08:18:42 +0000 |
| commit | d9ac28b70a01725eafe122ed138017193258eb3b (patch) | |
| tree | f804fe784807c79dc8d6eddb4cc7e64169bfe1a2 /profiles | |
| parent | Add missing camd dependency (diff) | |
| download | gentoo-2-d9ac28b70a01725eafe122ed138017193258eb3b.tar.gz gentoo-2-d9ac28b70a01725eafe122ed138017193258eb3b.tar.bz2 gentoo-2-d9ac28b70a01725eafe122ed138017193258eb3b.zip | |
Experimentally mark native ABI USE flag implicit for better user-friendliness.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/arch/amd64/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/arch/amd64/make.defaults | 7 | ||||
| -rw-r--r-- | profiles/arch/amd64/x32/make.defaults | 9 |
3 files changed, 19 insertions, 4 deletions
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog index ae5777a7a103..867c175b73ab 100644 --- a/profiles/arch/amd64/ChangeLog +++ b/profiles/arch/amd64/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.262 2014/06/15 09:49:38 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.263 2014/06/25 08:18:42 mgorny Exp $ + + 25 Jun 2014; Michał Górny <mgorny@gentoo.org> make.defaults, + x32/make.defaults: + Experimentally mark native ABI USE flag implicit for better + user-friendliness. 15 Jun 2014; Michał Górny <mgorny@gentoo.org> package.use.stable.mask: Stable-mask emul-linux-x86 flags that are used only to control abi_x86_32 diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults index 68a242a0e540..0081dca7e45e 100644 --- a/profiles/arch/amd64/make.defaults +++ b/profiles/arch/amd64/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.21 2014/01/18 01:03:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.22 2014/06/25 08:18:42 mgorny Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" @@ -53,3 +53,8 @@ ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens # Michał Górny <mgorny@gentoo.org> (26 Jan 2013) # Unhide the ABI_X86 USE_EXPAND. USE_EXPAND_HIDDEN="-ABI_X86" + +# Michał Górny <mgorny@gentoo.org> (25 Jun 2014) +# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied +# by non-multilib ebuilds when non-native ABIs are disabled. +IMPLICIT_IUSE="abi_x86_64" diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults index 7951c757f623..1877b3282e84 100644 --- a/profiles/arch/amd64/x32/make.defaults +++ b/profiles/arch/amd64/x32/make.defaults @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/make.defaults,v 1.2 2012/05/25 17:31:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/make.defaults,v 1.3 2014/06/25 08:18:42 mgorny Exp $ DEFAULT_ABI="x32" ABI="x32" @@ -9,3 +9,8 @@ MULTILIB_ABIS="amd64 x86 x32" FEATURES="collision-protect multilib-strict" SYMLINK_LIB="no" + +# Michał Górny <mgorny@gentoo.org> (25 Jun 2014) +# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied +# by non-multilib ebuilds when non-native ABIs are disabled. +IMPLICIT_IUSE="-abi_x86_64 abi_x86_x32" |