Add ABI_S390 defines.

8 files changed, 30 insertions, 8 deletions

diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index 88d7671e8359..b86a4ebe2ef2 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/make.defaults,v 1.7 2014/01/16 17:40:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/make.defaults,v 1.8 2014/04/01 06:55:15 vapier Exp $
 
 ARCH="s390"
 ACCEPT_KEYWORDS="s390 ~s390"
@@ -17,3 +17,6 @@ FCFLAGS="${CFLAGS}"
 
 INPUT_DEVICES="void"
 VIDEO_CARDS="dummy"
+
+# Enable abi_s390_32 for packages that don't have it forced.
+ABI_S390="32"
diff --git a/profiles/arch/s390/s390x/make.defaults b/profiles/arch/s390/s390x/make.defaults
index d68b35fea93b..4107379d9dd1 100644
--- a/profiles/arch/s390/s390x/make.defaults
+++ b/profiles/arch/s390/s390x/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/make.defaults,v 1.2 2013/01/13 13:20:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/make.defaults,v 1.3 2014/04/01 06:55:16 vapier Exp $
 
 MULTILIB_ABIS="s390x"
 DEFAULT_ABI="s390x"
@@ -9,3 +9,6 @@ ABI=${DEFAULT_ABI}
 CHOST="s390x-ibm-linux-gnu"
 
 BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib"
+
+# Enable abi_s390_64 for packages that don't have it forced.
+ABI_S390="64"
diff --git a/profiles/arch/s390/s390x/use.force b/profiles/arch/s390/s390x/use.force
index 7896e79e198d..ed2089eb5f1f 100644
--- a/profiles/arch/s390/s390x/use.force
+++ b/profiles/arch/s390/s390x/use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/use.force,v 1.1 2012/09/16 05:06:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/use.force,v 1.2 2014/04/01 06:55:16 vapier Exp $
 
 # We do not have multilib by default.
 -multilib
+
+# Force the flag corresponding to the only ABI.
+-abi_s390_32
+abi_s390_64
diff --git a/profiles/arch/s390/use.force b/profiles/arch/s390/use.force
index fcac5ab9e7a7..15538f648189 100644
--- a/profiles/arch/s390/use.force
+++ b/profiles/arch/s390/use.force
@@ -1,2 +1,5 @@
 # Force the flag which corresponds to ARCH.
 s390
+
+# Force the flag corresponding to the only ABI.
+abi_s390_32
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index f1f4edee887f..5176d13d2ccc 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -1,6 +1,10 @@
 # Unmask the flag which corresponds to ARCH.
 -s390
 
+# Unmask ABI flags for this arch.
+-abi_s390_32
+-abi_s390_64
+
 # Stuff we don't want/not tested
 pbins
 chicken
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 5e41b37591e3..979e60173dc9 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.666 2014/03/30 14:22:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.667 2014/04/01 06:52:19 vapier Exp $
+
+  01 Apr 2014; Mike Frysinger <vapier@gentoo.org> make.defaults, use.mask:
+  Add ABI_S390 defines.
 
   30 Mar 2014; Mike Gilbert <floppym@gentoo.org> use.mask, use.stable.mask:
   Convert python_targets_python3_4 into a stable mask.
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 5eb4ec43c8b7..2310bfe7295e 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.112 2014/03/29 03:01:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.113 2014/04/01 06:52:19 vapier Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -16,11 +16,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
 
 # 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 ABI_MIPS ABI_PPC ABI_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86"
 
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index add042c4c17a..d05cec066c2c 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.193 2014/03/30 14:22:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.194 2014/04/01 06:52:19 vapier Exp $
 
 # on the way out
 ruby_targets_ruby18
@@ -339,6 +339,8 @@ abi_mips_n32
 abi_mips_n64
 abi_ppc_32
 abi_ppc_64
+abi_s390_32
+abi_s390_64
 
 # Andrey Grozin <grozin@gentoo.org> (1 May 2013)
 # gcl is masked, cmucl only available on x86, clozurecl on x86 and amd64