summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/hardened')
-rw-r--r--profiles/hardened/ChangeLog6
-rw-r--r--profiles/hardened/linux/musl/make.defaults4
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/hardened/ChangeLog b/profiles/hardened/ChangeLog
index 4944af41026b..bbcbe39571f0 100644
--- a/profiles/hardened/ChangeLog
+++ b/profiles/hardened/ChangeLog
@@ -1,10 +1,14 @@
# ChangeLog for Gentoo/AMD64 profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.69 2014/10/12 07:40:21 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.70 2014/10/14 17:06:17 blueness Exp $
12 Oct 2014; Magnus Granberg <zorry@gentoo.org> linux/amd64/package.use:
Add pic for media-libs/libpostpros needed for the x86 part #523736
+ 14 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+ linux/musl/make.defaults:
+ BOOTSTRAP_USE=-nls to avoid a clash between musl and gettext in stage2
+
11 Oct 2014; Tim Harder <radhermit@gentoo.org> linux/package.use.mask:
Mask skype use flag for net-im/bitlbee since skype doesn't work under
hardened.
diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
index aaf4cbb1d887..53d94d222ba9 100644
--- a/profiles/hardened/linux/musl/make.defaults
+++ b/profiles/hardened/linux/musl/make.defaults
@@ -1,13 +1,13 @@
# Copyright 1999-2014 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/make.defaults,v 1.5 2014/06/09 15:19:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/make.defaults,v 1.6 2014/10/14 17:06:17 blueness Exp $
ELIBC="musl"
FEATURES="sandbox sfperms strict"
USE="hardened nptl pax_kernel pic unicode xattr -berkdb -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb -jit -orc"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb -jit -nls -orc"
SYMLINK_LIB="no"