diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-04-01 06:55:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-04-01 06:55:16 +0000 |
| commit | b8c536c5df84b566aaf5f93d78cecccf8e8e3b50 (patch) | |
| tree | d71cd88fc1a5fc696f3b8016873380458d2a0d33 /profiles | |
| parent | Document ABI_S390. (diff) | |
| download | gentoo-2-b8c536c5df84b566aaf5f93d78cecccf8e8e3b50.tar.gz gentoo-2-b8c536c5df84b566aaf5f93d78cecccf8e8e3b50.tar.bz2 gentoo-2-b8c536c5df84b566aaf5f93d78cecccf8e8e3b50.zip | |
Add ABI_S390 defines.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/arch/s390/make.defaults | 5 | ||||
| -rw-r--r-- | profiles/arch/s390/s390x/make.defaults | 5 | ||||
| -rw-r--r-- | profiles/arch/s390/s390x/use.force | 6 | ||||
| -rw-r--r-- | profiles/arch/s390/use.force | 3 | ||||
| -rw-r--r-- | profiles/arch/s390/use.mask | 4 |
5 files changed, 20 insertions, 3 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 |