| 1 |
--- |
| 2 |
gx86/profiles/arch/amd64/make.defaults | 4 ++++ |
| 3 |
gx86/profiles/arch/amd64/no-multilib/make.defaults | 4 ++++ |
| 4 |
gx86/profiles/arch/amd64/no-multilib/use.mask | 4 ++++ |
| 5 |
gx86/profiles/arch/amd64/use.force | 4 ++++ |
| 6 |
gx86/profiles/arch/amd64/use.mask | 5 +++++ |
| 7 |
5 files changed, 21 insertions(+) |
| 8 |
|
| 9 |
diff --git a/gx86/profiles/arch/amd64/make.defaults b/gx86/profiles/arch/amd64/make.defaults |
| 10 |
index bd020bb..4ad5c0b 100644 |
| 11 |
--- a/gx86/profiles/arch/amd64/make.defaults |
| 12 |
+++ b/gx86/profiles/arch/amd64/make.defaults |
| 13 |
@@ -45,3 +45,7 @@ VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx |
| 14 |
# 2006/12/22 - Danny van Dyk <kugelfang@g.o> |
| 15 |
# Default for ALSA_CARDS USE_EXPAND variable. |
| 16 |
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" |
| 17 |
+ |
| 18 |
+# Michał Górny <mgorny@g.o> (26 Jan 2013) |
| 19 |
+# Unhide the ABI_X86 USE_EXPAND. |
| 20 |
+USE_EXPAND_HIDDEN="-ABI_X86" |
| 21 |
diff --git a/gx86/profiles/arch/amd64/no-multilib/make.defaults b/gx86/profiles/arch/amd64/no-multilib/make.defaults |
| 22 |
index 5f5b0f7..b05e8e4 100644 |
| 23 |
--- a/gx86/profiles/arch/amd64/no-multilib/make.defaults |
| 24 |
+++ b/gx86/profiles/arch/amd64/no-multilib/make.defaults |
| 25 |
@@ -3,3 +3,7 @@ |
| 26 |
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/make.defaults,v 1.1 2008/04/01 17:39:54 wolf31o2 Exp $ |
| 27 |
|
| 28 |
MULTILIB_ABIS="amd64" |
| 29 |
+ |
| 30 |
+# Michał Górny <mgorny@g.o> (26 Jan 2013) |
| 31 |
+# Hide the ABI_X86 USE_EXPAND back for non-multilib profile. |
| 32 |
+USE_EXPAND_HIDDEN="ABI_X86" |
| 33 |
diff --git a/gx86/profiles/arch/amd64/no-multilib/use.mask b/gx86/profiles/arch/amd64/no-multilib/use.mask |
| 34 |
index 8446804..9bc0ab5 100644 |
| 35 |
--- a/gx86/profiles/arch/amd64/no-multilib/use.mask |
| 36 |
+++ b/gx86/profiles/arch/amd64/no-multilib/use.mask |
| 37 |
@@ -19,3 +19,7 @@ hvm |
| 38 |
# Matt Turner <mattst88@g.o) (10 Feb 2012) |
| 39 |
# mask d3d since wine is 32-bit |
| 40 |
d3d |
| 41 |
+ |
| 42 |
+# Michał Górny <mgorny@g.o> (26 Jan 2013) |
| 43 |
+# Mask the multilib flags back for non-multilib profile. |
| 44 |
+abi_x86_32 |
| 45 |
diff --git a/gx86/profiles/arch/amd64/use.force b/gx86/profiles/arch/amd64/use.force |
| 46 |
index b54bac8..53a3333 100644 |
| 47 |
--- a/gx86/profiles/arch/amd64/use.force |
| 48 |
+++ b/gx86/profiles/arch/amd64/use.force |
| 49 |
@@ -1,2 +1,6 @@ |
| 50 |
# Force the flag which corresponds to ARCH. |
| 51 |
amd64 |
| 52 |
+ |
| 53 |
+# Michał Górny <mgorny@g.o> (26 Jan 2013) |
| 54 |
+# Force the flag corresponding to the default ABI. |
| 55 |
+abi_x86_64 |
| 56 |
diff --git a/gx86/profiles/arch/amd64/use.mask b/gx86/profiles/arch/amd64/use.mask |
| 57 |
index d4df20a..3f9ad19 100644 |
| 58 |
--- a/gx86/profiles/arch/amd64/use.mask |
| 59 |
+++ b/gx86/profiles/arch/amd64/use.mask |
| 60 |
@@ -181,4 +181,9 @@ capslib |
| 61 |
# fdk-aac is already keyworded here |
| 62 |
-fdk |
| 63 |
|
| 64 |
+# Michał Górny <mgorny@g.o> (26 Jan 2013) |
| 65 |
+# Unmask the multilib flags for this arch. |
| 66 |
+-abi_x86_32 |
| 67 |
+-abi_x86_64 |
| 68 |
+ |
| 69 |
# NOT NECESSARY - SECTION |
| 70 |
-- |
| 71 |
1.8.1.1 |
Archives