| 1 |
--- |
| 2 |
gx86/profiles/base/make.defaults | 4 ++-- |
| 3 |
gx86/profiles/base/use.mask | 5 +++++ |
| 4 |
gx86/profiles/desc/abi_x86.desc | 10 ++++++++++ |
| 5 |
3 files changed, 17 insertions(+), 2 deletions(-) |
| 6 |
create mode 100644 gx86/profiles/desc/abi_x86.desc |
| 7 |
|
| 8 |
diff --git a/gx86/profiles/base/make.defaults b/gx86/profiles/base/make.defaults |
| 9 |
index 00761b6..07e19cf 100644 |
| 10 |
--- a/gx86/profiles/base/make.defaults |
| 11 |
+++ b/gx86/profiles/base/make.defaults |
| 12 |
@@ -16,11 +16,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" |
| 13 |
|
| 14 |
# Env vars to expand into USE vars. Modifying this requires prior |
| 15 |
# discussion on gentoo-dev@g.o. |
| 16 |
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET" |
| 17 |
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET ABI_X86" |
| 18 |
|
| 19 |
# USE_EXPAND variables whose contents are not shown in package manager |
| 20 |
# output. Changes need discussion on gentoo-dev. |
| 21 |
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS" |
| 22 |
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_X86" |
| 23 |
|
| 24 |
CONFIG_PROTECT="/etc" |
| 25 |
CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" |
| 26 |
diff --git a/gx86/profiles/base/use.mask b/gx86/profiles/base/use.mask |
| 27 |
index 1ff9aef..a2fe061 100644 |
| 28 |
--- a/gx86/profiles/base/use.mask |
| 29 |
+++ b/gx86/profiles/base/use.mask |
| 30 |
@@ -327,3 +327,8 @@ python_targets_pypy2_0 |
| 31 |
python_single_target_pypy1_8 |
| 32 |
python_single_target_pypy1_9 |
| 33 |
python_single_target_pypy2_0 |
| 34 |
+ |
| 35 |
+# Michał Górny <mgorny@g.o> (26 Jan 2013) |
| 36 |
+# Mask the multilib flags globally. Unmasked in specific arches. |
| 37 |
+abi_x86_32 |
| 38 |
+abi_x86_64 |
| 39 |
diff --git a/gx86/profiles/desc/abi_x86.desc b/gx86/profiles/desc/abi_x86.desc |
| 40 |
new file mode 100644 |
| 41 |
index 0000000..6d58bfa |
| 42 |
--- /dev/null |
| 43 |
+++ b/gx86/profiles/desc/abi_x86.desc |
| 44 |
@@ -0,0 +1,10 @@ |
| 45 |
+# Copyright 2013 Gentoo Foundation. |
| 46 |
+# Distributed under the terms of the GNU General Public License v2 |
| 47 |
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/alsa_cards.desc,v 1.8 2009/08/13 15:09:23 beandog Exp $ |
| 48 |
+ |
| 49 |
+# This file contains descriptions of ABI_X86 USE_EXPAND flags. |
| 50 |
+ |
| 51 |
+# Keep it sorted. Please do not add anything without prior discussion |
| 52 |
+# on gentoo-dev. |
| 53 |
+32 - 32-bit (x86) libraries |
| 54 |
+64 - 64-bit (amd64) libraries |
| 55 |
-- |
| 56 |
1.8.1.1 |
Archives