Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in profiles/arch/s390/s390x: make.defaults use.mask
Date: Tue, 01 Jul 2014 08:28:36
Message-Id: 20140701082832.24D3B2004F@flycatcher.gentoo.org
1 mgorny 14/07/01 08:28:32
2
3 Modified: make.defaults
4 Added: use.mask
5 Log:
6 Adjust use.mask properly and hide the flags since the both profiles are non-multilib by default. Add IUSE_IMPLICIT.
7
8 Revision Changes Path
9 1.5 profiles/arch/s390/s390x/make.defaults
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/make.defaults?rev=1.5&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/make.defaults?rev=1.5&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/make.defaults?r1=1.4&r2=1.5
14
15 Index: make.defaults
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/make.defaults,v
18 retrieving revision 1.4
19 retrieving revision 1.5
20 diff -u -r1.4 -r1.5
21 --- make.defaults 5 Apr 2014 15:38:48 -0000 1.4
22 +++ make.defaults 1 Jul 2014 08:28:31 -0000 1.5
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2014 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/make.defaults,v 1.4 2014/04/05 15:38:48 vapier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/make.defaults,v 1.5 2014/07/01 08:28:31 mgorny Exp $
28
29 MULTILIB_ABIS="s390x"
30 DEFAULT_ABI="s390x"
31 @@ -8,5 +8,10 @@
32
33 CHOST="s390x-ibm-linux-gnu"
34
35 +# Michał Górny <mgorny@g.o> (01 Jul 2014)
36 +# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
37 +# by non-multilib ebuilds when non-native ABIs are disabled.
38 +IUSE_IMPLICIT="abi_s390_64 -abi_s390_32"
39 +
40 # Enable abi_s390_64 for packages that don't have it forced.
41 ABI_S390="64"
42
43
44
45 1.1 profiles/arch/s390/s390x/use.mask
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/use.mask?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/use.mask?rev=1.1&content-type=text/plain
49
50 Index: use.mask
51 ===================================================================
52 # Switch ABI flags for this arch.
53 abi_s390_32
54 -abi_s390_64