Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in profiles/arch/s390/s390x: make.defaults use.force
Date: Tue, 01 Apr 2014 06:55:23
Message-Id: 20140401065516.3F7EA20060@flycatcher.gentoo.org
1 vapier 14/04/01 06:55:16
2
3 Modified: make.defaults use.force
4 Log:
5 Add ABI_S390 defines.
6
7 Revision Changes Path
8 1.3 profiles/arch/s390/s390x/make.defaults
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/make.defaults?rev=1.3&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/make.defaults?rev=1.3&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/make.defaults?r1=1.2&r2=1.3
13
14 Index: make.defaults
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/make.defaults,v
17 retrieving revision 1.2
18 retrieving revision 1.3
19 diff -u -r1.2 -r1.3
20 --- make.defaults 13 Jan 2013 13:20:38 -0000 1.2
21 +++ make.defaults 1 Apr 2014 06:55:16 -0000 1.3
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2013 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/make.defaults,v 1.2 2013/01/13 13:20:38 armin76 Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/make.defaults,v 1.3 2014/04/01 06:55:16 vapier Exp $
27
28 MULTILIB_ABIS="s390x"
29 DEFAULT_ABI="s390x"
30 @@ -9,3 +9,6 @@
31 CHOST="s390x-ibm-linux-gnu"
32
33 BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib"
34 +
35 +# Enable abi_s390_64 for packages that don't have it forced.
36 +ABI_S390="64"
37
38
39
40 1.2 profiles/arch/s390/s390x/use.force
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/use.force?rev=1.2&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/use.force?rev=1.2&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/s390x/use.force?r1=1.1&r2=1.2
45
46 Index: use.force
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/use.force,v
49 retrieving revision 1.1
50 retrieving revision 1.2
51 diff -u -r1.1 -r1.2
52 --- use.force 16 Sep 2012 05:06:55 -0000 1.1
53 +++ use.force 1 Apr 2014 06:55:16 -0000 1.2
54 @@ -1,6 +1,10 @@
55 # Copyright 1999-2012 Gentoo Foundation.
56 # Distributed under the terms of the GNU General Public License, v2
57 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/use.force,v 1.1 2012/09/16 05:06:55 vapier Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/s390x/use.force,v 1.2 2014/04/01 06:55:16 vapier Exp $
59
60 # We do not have multilib by default.
61 -multilib
62 +
63 +# Force the flag corresponding to the only ABI.
64 +-abi_s390_32
65 +abi_s390_64