summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-07-03 07:48:49 +0000
committerMichał Górny <mgorny@gentoo.org>2014-07-03 07:48:49 +0000
commitf7243b63de0cd08b847cfa8f154a86d53599ecc7 (patch)
tree1231b56df541fb39ab53307d33570542fdd195fd /eclass
parentx86/amd64 stable, security bug #515034, thank Andreis Vinogradovs ( slepnoga ... (diff)
downloadgentoo-2-f7243b63de0cd08b847cfa8f154a86d53599ecc7.tar.gz
gentoo-2-f7243b63de0cd08b847cfa8f154a86d53599ecc7.tar.bz2
gentoo-2-f7243b63de0cd08b847cfa8f154a86d53599ecc7.zip
Re-enable multilib flags for s390.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/multilib-build.eclass4
2 files changed, 7 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index c53669650dca..49319b5efdd3 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1306 2014/06/29 14:24:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1307 2014/07/03 07:48:49 mgorny Exp $
+
+ 03 Jul 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Re-enable multilib flags for s390.
29 Jun 2014; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass,
python-utils-r1.eclass:
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index ba3ebc044bda..3365b4e1d588 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -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/eclass/multilib-build.eclass,v 1.59 2014/06/29 08:32:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.60 2014/07/03 07:48:49 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -46,6 +46,8 @@ _MULTILIB_FLAGS=(
abi_mips_o32:o32
abi_ppc_32:ppc
abi_ppc_64:ppc64
+ abi_s390_32:s390
+ abi_s390_64:s390x
)
# @ECLASS-VARIABLE: MULTILIB_COMPAT