diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-01-30 21:48:00 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-01-30 21:48:00 +0000 |
| commit | 2d940dfd33d2532451c4f7539f114c3953f46e31 (patch) | |
| tree | b368b07348696a40fba78492680e3e1c039e624e /profiles/arch | |
| parent | Shorten pkg setup. Sort functions. Remove old. (diff) | |
| download | gentoo-2-2d940dfd33d2532451c4f7539f114c3953f46e31.tar.gz gentoo-2-2d940dfd33d2532451c4f7539f114c3953f46e31.tar.bz2 gentoo-2-2d940dfd33d2532451c4f7539f114c3953f46e31.zip | |
Hide CPU_FLAGS_X86 everywhere but on amd64 & x86.
Diffstat (limited to 'profiles/arch')
| -rw-r--r-- | profiles/arch/amd64/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/arch/amd64/make.defaults | 6 | ||||
| -rw-r--r-- | profiles/arch/x86/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/arch/x86/make.defaults | 8 |
4 files changed, 17 insertions, 7 deletions
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog index 9d48b6df5cb4..f208fffbfb71 100644 --- a/profiles/arch/amd64/ChangeLog +++ b/profiles/arch/amd64/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.302 2015/01/28 21:29:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.303 2015/01/30 21:48:00 mgorny Exp $ + + 30 Jan 2015; Michał Górny <mgorny@gentoo.org> make.defaults: + Hide CPU_FLAGS_X86 everywhere but on amd64 & x86. 28 Jan 2015; Michał Górny <mgorny@gentoo.org> package.use.force, package.use.mask: diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults index 4d58603fd6c1..c4143a77c506 100644 --- a/profiles/arch/amd64/make.defaults +++ b/profiles/arch/amd64/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.24 2015/01/28 20:56:51 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.25 2015/01/30 21:48:00 mgorny Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" @@ -52,8 +52,8 @@ VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" # Michał Górny <mgorny@gentoo.org> (26 Jan 2013) -# Unhide the ABI_X86 USE_EXPAND. -USE_EXPAND_HIDDEN="-ABI_X86" +# Unhide the x86-specific USE_EXPANDs. +USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86" # Michał Górny <mgorny@gentoo.org> (25 Jun 2014) # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog index 8809eeb282c1..16c6eaa868af 100644 --- a/profiles/arch/x86/ChangeLog +++ b/profiles/arch/x86/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/x86 profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.188 2015/01/28 21:33:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.189 2015/01/30 21:48:00 mgorny Exp $ + + 30 Jan 2015; Michał Górny <mgorny@gentoo.org> make.defaults: + Hide CPU_FLAGS_X86 everywhere but on amd64 & x86. 28 Jan 2015; Michał Górny <mgorny@gentoo.org> package.use.mask: Update package.use.* entries for CPU_FLAGS_X86. Keep duplicate with old flags diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults index 956be2bae006..da8597efc969 100644 --- a/profiles/arch/x86/make.defaults +++ b/profiles/arch/x86/make.defaults @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/make.defaults,v 1.16 2014/07/01 07:50:38 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/make.defaults,v 1.17 2015/01/30 21:48:00 mgorny Exp $ # All extra USE/etc should be specified in sub-profiles. # DO NOT POLLUTE USE ON THIS PROFILE. @@ -14,6 +14,10 @@ CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" +# Michał Górny <mgorny@gentoo.org> (30 Jan 2015) +# Unhide the CPU_FLAGS_X86 USE_EXPANDs. +USE_EXPAND_HIDDEN="-CPU_FLAGS_X86" + # Michał Górny <mgorny@gentoo.org> (20 Jun 2014) # Provide values for ABI-related variables that are compatible with # multilib amd64, to make consistent ebuild writing easier. |