Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in profiles/hardened/linux/musl/amd64: make.defaults use.force use.mask
Date: Tue, 01 Jul 2014 12:37:39
Message-Id: 20140701123735.D65EB2004F@flycatcher.gentoo.org
1 blueness 14/07/01 12:37:35
2
3 Modified: make.defaults use.force use.mask
4 Log:
5 Make linux/musl multilib aware, bug #515130
6
7 Revision Changes Path
8 1.6 profiles/hardened/linux/musl/amd64/make.defaults
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults?rev=1.6&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults?rev=1.6&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults?r1=1.5&r2=1.6
13
14 Index: make.defaults
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v
17 retrieving revision 1.5
18 retrieving revision 1.6
19 diff -u -r1.5 -r1.6
20 --- make.defaults 9 Jun 2014 15:19:09 -0000 1.5
21 +++ make.defaults 1 Jul 2014 12:37:35 -0000 1.6
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2014 Gentoo Foundation.
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v 1.5 2014/06/09 15:19:09 blueness Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v 1.6 2014/07/01 12:37:35 blueness Exp $
27
28 ARCH="amd64"
29 ACCEPT_KEYWORDS="${ARCH}"
30 @@ -10,3 +10,12 @@
31 CXXFLAGS="${CFLAGS}"
32 FFLAGS="${CFLAGS}"
33 FCFLAGS="${CFLAGS}"
34 +
35 +# Anthony G. Basile <blueness@g.o> (01 Jul 2014)
36 +# Multilib-related setup, bug #515130
37 +ABI="amd64"
38 +DEFAULT_ABI="amd64"
39 +MULTILIB_ABIS="amd64"
40 +CHOST_amd64=${CHOST}
41 +LIBDIR_amd64="lib"
42 +IUSE_IMPLICIT="abi_x86_64"
43
44
45
46 1.3 profiles/hardened/linux/musl/amd64/use.force
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force?rev=1.3&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force?rev=1.3&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force?r1=1.2&r2=1.3
51
52 Index: use.force
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force,v
55 retrieving revision 1.2
56 retrieving revision 1.3
57 diff -u -r1.2 -r1.3
58 --- use.force 9 Mar 2014 23:18:34 -0000 1.2
59 +++ use.force 1 Jul 2014 12:37:35 -0000 1.3
60 @@ -1,9 +1,7 @@
61 # Copyright 1999-2014 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force,v 1.2 2014/03/09 23:18:34 blueness Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force,v 1.3 2014/07/01 12:37:35 blueness Exp $
65
66 -# Force the flag which corresponds to ARCH.
67 +# Force the flag which corresponds to arch/abi, bug #515130
68 amd64
69 -
70 -# Force the flag corresponding to the default ABI.
71 abi_x86_64
72
73
74
75 1.3 profiles/hardened/linux/musl/amd64/use.mask
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask?rev=1.3&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask?rev=1.3&content-type=text/plain
79 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask?r1=1.2&r2=1.3
80
81 Index: use.mask
82 ===================================================================
83 RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask,v
84 retrieving revision 1.2
85 retrieving revision 1.3
86 diff -u -r1.2 -r1.3
87 --- use.mask 9 Mar 2014 23:18:34 -0000 1.2
88 +++ use.mask 1 Jul 2014 12:37:35 -0000 1.3
89 @@ -1,11 +1,9 @@
90 # Copyright 1999-2014 Gentoo Foundation
91 # Distributed under the terms of the GNU General Public License v2
92 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask,v 1.2 2014/03/09 23:18:34 blueness Exp $
93 +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask,v 1.3 2014/07/01 12:37:35 blueness Exp $
94
95 -# Unmask the flag which corresponds to ARCH.
96 +# Force the flag which corresponds to arch/abi, bug #515130
97 -amd64
98 -
99 -# Unmask the multilib flags for this arch.
100 -abi_x86_64
101
102 # unmask all SIMD assembler flags