--- gx86/profiles/arch/amd64/make.defaults | 4 ++++ gx86/profiles/arch/amd64/no-multilib/make.defaults | 4 ++++ gx86/profiles/arch/amd64/no-multilib/use.mask | 4 ++++ gx86/profiles/arch/amd64/use.force | 4 ++++ gx86/profiles/arch/amd64/use.mask | 5 +++++ 5 files changed, 21 insertions(+)
diff --git a/gx86/profiles/arch/amd64/make.defaults b/gx86/profiles/arch/amd64/make.defaults index bd020bb..4ad5c0b 100644 --- a/gx86/profiles/arch/amd64/make.defaults +++ b/gx86/profiles/arch/amd64/make.defaults @@ -45,3 +45,7 @@ VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx # 2006/12/22 - Danny van Dyk <kugelf...@gentoo.org> # Default for ALSA_CARDS USE_EXPAND variable. 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 <mgo...@gentoo.org> (26 Jan 2013) +# Unhide the ABI_X86 USE_EXPAND. +USE_EXPAND_HIDDEN="-ABI_X86" diff --git a/gx86/profiles/arch/amd64/no-multilib/make.defaults b/gx86/profiles/arch/amd64/no-multilib/make.defaults index 5f5b0f7..b05e8e4 100644 --- a/gx86/profiles/arch/amd64/no-multilib/make.defaults +++ b/gx86/profiles/arch/amd64/no-multilib/make.defaults @@ -3,3 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/make.defaults,v 1.1 2008/04/01 17:39:54 wolf31o2 Exp $ MULTILIB_ABIS="amd64" + +# Michał Górny <mgo...@gentoo.org> (26 Jan 2013) +# Hide the ABI_X86 USE_EXPAND back for non-multilib profile. +USE_EXPAND_HIDDEN="ABI_X86" diff --git a/gx86/profiles/arch/amd64/no-multilib/use.mask b/gx86/profiles/arch/amd64/no-multilib/use.mask index 8446804..9bc0ab5 100644 --- a/gx86/profiles/arch/amd64/no-multilib/use.mask +++ b/gx86/profiles/arch/amd64/no-multilib/use.mask @@ -19,3 +19,7 @@ hvm # Matt Turner <matts...@gentoo.org) (10 Feb 2012) # mask d3d since wine is 32-bit d3d + +# Michał Górny <mgo...@gentoo.org> (26 Jan 2013) +# Mask the multilib flags back for non-multilib profile. +abi_x86_32 diff --git a/gx86/profiles/arch/amd64/use.force b/gx86/profiles/arch/amd64/use.force index b54bac8..53a3333 100644 --- a/gx86/profiles/arch/amd64/use.force +++ b/gx86/profiles/arch/amd64/use.force @@ -1,2 +1,6 @@ # Force the flag which corresponds to ARCH. amd64 + +# Michał Górny <mgo...@gentoo.org> (26 Jan 2013) +# Force the flag corresponding to the default ABI. +abi_x86_64 diff --git a/gx86/profiles/arch/amd64/use.mask b/gx86/profiles/arch/amd64/use.mask index d4df20a..3f9ad19 100644 --- a/gx86/profiles/arch/amd64/use.mask +++ b/gx86/profiles/arch/amd64/use.mask @@ -181,4 +181,9 @@ capslib # fdk-aac is already keyworded here -fdk +# Michał Górny <mgo...@gentoo.org> (26 Jan 2013) +# Unmask the multilib flags for this arch. +-abi_x86_32 +-abi_x86_64 + # NOT NECESSARY - SECTION -- 1.8.1.1
