diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-04-05 15:38:48 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-04-05 15:38:48 +0000 |
| commit | a1492aed68de5ece5cfc89e3603c32b983e96e70 (patch) | |
| tree | 51f2a676bfc2fbf0928dbe8f0b8f44bd721ad838 /profiles/arch | |
| parent | Version bump erlang to 16.3.1 (fixes #506830). (diff) | |
| download | gentoo-2-a1492aed68de5ece5cfc89e3603c32b983e96e70.tar.gz gentoo-2-a1492aed68de5ece5cfc89e3603c32b983e96e70.tar.bz2 gentoo-2-a1492aed68de5ece5cfc89e3603c32b983e96e70.zip | |
Adjust multilib settings after the multilib USE flag rework.
Diffstat (limited to 'profiles/arch')
| -rw-r--r-- | profiles/arch/s390/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/arch/s390/make.defaults | 8 | ||||
| -rw-r--r-- | profiles/arch/s390/s390x/make.defaults | 6 | ||||
| -rw-r--r-- | profiles/arch/s390/s390x/use.force | 7 | ||||
| -rw-r--r-- | profiles/arch/s390/use.force | 7 |
5 files changed, 22 insertions, 12 deletions
diff --git a/profiles/arch/s390/ChangeLog b/profiles/arch/s390/ChangeLog index 80023f55c9be..014624ce3f12 100644 --- a/profiles/arch/s390/ChangeLog +++ b/profiles/arch/s390/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Gentoo/s390 profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.76 2014/03/19 00:18:11 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.77 2014/04/05 15:38:48 vapier Exp $ + + 05 Apr 2014; Mike Frysinger <vapier@gentoo.org> make.defaults, + s390x/make.defaults, s390x/use.force, use.force: + Adjust multilib settings after the multilib USE flag rework. 19 Mar 2014; Andreas K. Huettel <dilfridge@gentoo.org> +eapi, +s390x/eapi: Increase EAPI to 5 diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults index 6b3a27ecaa0e..694f9ceb08b8 100644 --- a/profiles/arch/s390/make.defaults +++ b/profiles/arch/s390/make.defaults @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.9 2014/04/03 16:58:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/make.defaults,v 1.10 2014/04/05 15:38:48 vapier Exp $ ARCH="s390" ACCEPT_KEYWORDS="s390 ~s390" @@ -23,3 +23,7 @@ ABI_S390="32" # Unhide the ABI_S390 USE_EXPAND. USE_EXPAND_HIDDEN="-ABI_S390" + +# While multilib is available, we don't default it to on. +BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib" +USE="-multilib" diff --git a/profiles/arch/s390/s390x/make.defaults b/profiles/arch/s390/s390x/make.defaults index 4107379d9dd1..c59ed99e22a6 100644 --- a/profiles/arch/s390/s390x/make.defaults +++ b/profiles/arch/s390/s390x/make.defaults @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.3 2014/04/01 06:55:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/make.defaults,v 1.4 2014/04/05 15:38:48 vapier Exp $ MULTILIB_ABIS="s390x" DEFAULT_ABI="s390x" @@ -8,7 +8,5 @@ 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 ed2089eb5f1f..a60fb992a9a8 100644 --- a/profiles/arch/s390/s390x/use.force +++ b/profiles/arch/s390/s390x/use.force @@ -1,9 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation. +# Copyright 1999-2014 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.2 2014/04/01 06:55:16 vapier Exp $ - -# We do not have multilib by default. --multilib +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/use.force,v 1.3 2014/04/05 15:38:48 vapier Exp $ # Force the flag corresponding to the only ABI. -abi_s390_32 diff --git a/profiles/arch/s390/use.force b/profiles/arch/s390/use.force index 15538f648189..c181af7abc69 100644 --- a/profiles/arch/s390/use.force +++ b/profiles/arch/s390/use.force @@ -1,5 +1,12 @@ +# Copyright 1999-2014 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/use.force,v 1.3 2014/04/05 15:38:48 vapier Exp $ + # Force the flag which corresponds to ARCH. s390 # Force the flag corresponding to the only ABI. abi_s390_32 + +# We do not have multilib by default. +-multilib |