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/x86: make.defaults
Date: Fri, 24 Jan 2014 20:05:08
Message-Id: 20140124200504.9EEA920051@flycatcher.gentoo.org
1 blueness 14/01/24 20:05:04
2
3 Modified: make.defaults
4 Log:
5 linux/musl: fix linker path and remove libiconv
6
7 Revision Changes Path
8 1.2 profiles/hardened/linux/musl/x86/make.defaults
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults?rev=1.2&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults?rev=1.2&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults?r1=1.1&r2=1.2
13
14 Index: make.defaults
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults,v
17 retrieving revision 1.1
18 retrieving revision 1.2
19 diff -u -r1.1 -r1.2
20 --- make.defaults 9 Aug 2013 09:47:51 -0000 1.1
21 +++ make.defaults 24 Jan 2014 20:05:04 -0000 1.2
22 @@ -1,12 +1,19 @@
23 -# Copyright 1999-2012 Gentoo Foundation.
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/hardened/linux/musl/x86/make.defaults,v 1.1 2013/08/09 09:47:51 blueness Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults,v 1.2 2014/01/24 20:05:04 blueness Exp $
28
29 ARCH="x86"
30 ACCEPT_KEYWORDS="${ARCH}"
31
32 CHOST="i686-gentoo-linux-musl"
33 -CFLAGS="-O2 -pipe"
34 +CFLAGS="-O2 -pipe -Wl,-dynamic-linker,/usr/lib/libc.so"
35 CXXFLAGS="${CFLAGS}"
36 FFLAGS="${CFLAGS}"
37 FCFLAGS="${CFLAGS}"
38 +
39 +# TODO: fix so musl doesn't generate this for all packages
40 +# that use a charset, it causes package collisons.
41 +INSTALL_MASK="charset.alias"
42 +
43 +# TODO: we need to make sandbox work
44 +FEATURES="-sandbox"