64- and 32-bit libs involved. No x32 yet since I have no idea about it. --- gx86/profiles/arch/amd64/make.defaults | 4 ++++ gx86/profiles/arch/amd64/use.force | 4 ++++ gx86/profiles/arch/amd64/use.mask | 5 +++++ gx86/profiles/base/make.defaults | 4 ++-- gx86/profiles/base/use.mask | 5 +++++ gx86/profiles/desc/abi_x86.desc | 9 +++++++++ 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gx86/profiles/desc/abi_x86.desc
diff --git a/gx86/profiles/arch/amd64/make.defaults b/gx86/profiles/arch/amd64/make.defaults index bd020bb..27c480a 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> (23 Jan 2013) +# Make the ABI_X86 multilib USE_EXPAND visible for the profile. +USE_EXPAND_HIDDEN="-ABI_X86" diff --git a/gx86/profiles/arch/amd64/use.force b/gx86/profiles/arch/amd64/use.force index b54bac8..51d7a75 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> (23 Jan 2013) +# Force building native libraries for the platform. +abi_x86_64 diff --git a/gx86/profiles/arch/amd64/use.mask b/gx86/profiles/arch/amd64/use.mask index 123bdfc..4fc14c3 100644 --- a/gx86/profiles/arch/amd64/use.mask +++ b/gx86/profiles/arch/amd64/use.mask @@ -177,4 +177,9 @@ capslib # fdk-aac is already keyworded here -fdk +# Michał Górny <mgo...@gentoo.org> (23 Jan 2013) +# Unmask multilib flags for the platform. +-abi_x86_32 +-abi_x86_64 + # NOT NECESSARY - SECTION 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 811fa3b..3dc0c36 100644 --- a/gx86/profiles/base/use.mask +++ b/gx86/profiles/base/use.mask @@ -323,3 +323,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> (23 Jan 2013) +# Mask all of the multilib flags for non-multilib profiles. +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..5a11f2a --- /dev/null +++ b/gx86/profiles/desc/abi_x86.desc @@ -0,0 +1,9 @@ +# Copyright 2013 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# This file contains descriptions of ABI_X86 USE_EXPAND flags. + +# Keep it sorted. +64 - 64-bit (amd64) libraries +32 - 32-bit (x86) libraries -- 1.8.1.1
