--- gx86/profiles/base/make.defaults | 4 ++-- gx86/profiles/base/use.mask | 5 +++++ gx86/profiles/desc/abi_x86.desc | 10 ++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 gx86/profiles/desc/abi_x86.desc
diff --git a/gx86/profiles/base/make.defaults b/gx86/profiles/base/make.defaults index 00761b6..07e19cf 100644 --- a/gx86/profiles/base/make.defaults +++ b/gx86/profiles/base/make.defaults @@ -16,11 +16,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-...@gentoo.org. -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" +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" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS" +USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_X86" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" diff --git a/gx86/profiles/base/use.mask b/gx86/profiles/base/use.mask index 1ff9aef..a2fe061 100644 --- a/gx86/profiles/base/use.mask +++ b/gx86/profiles/base/use.mask @@ -327,3 +327,8 @@ python_targets_pypy2_0 python_single_target_pypy1_8 python_single_target_pypy1_9 python_single_target_pypy2_0 + +# Michał Górny <mgo...@gentoo.org> (26 Jan 2013) +# Mask the multilib flags globally. Unmasked in specific arches. +abi_x86_32 +abi_x86_64 diff --git a/gx86/profiles/desc/abi_x86.desc b/gx86/profiles/desc/abi_x86.desc new file mode 100644 index 0000000..6d58bfa --- /dev/null +++ b/gx86/profiles/desc/abi_x86.desc @@ -0,0 +1,10 @@ +# Copyright 2013 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/desc/alsa_cards.desc,v 1.8 2009/08/13 15:09:23 beandog Exp $ + +# This file contains descriptions of ABI_X86 USE_EXPAND flags. + +# Keep it sorted. Please do not add anything without prior discussion +# on gentoo-dev. +32 - 32-bit (x86) libraries +64 - 64-bit (amd64) libraries -- 1.8.1.1
