summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-05-28 14:48:04 +0000
committerAnthony G. Basile <blueness@gentoo.org>2013-05-28 14:48:04 +0000
commit78d30450db8ec34e8f514c301dbc3515606afc69 (patch)
treee7be6d6a96fc8b7cbe137a3fe048235cf69f8567 /profiles
parentTypo. (diff)
downloadhistorical-78d30450db8ec34e8f514c301dbc3515606afc69.tar.gz
historical-78d30450db8ec34e8f514c301dbc3515606afc69.tar.bz2
historical-78d30450db8ec34e8f514c301dbc3515606afc69.zip
Unmask jit and orc, but turn them off by default on hardened/linux/uclibc
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/hardened/linux/uclibc/make.defaults8
-rw-r--r--profiles/hardened/linux/uclibc/use.mask8
3 files changed, 11 insertions, 11 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b5ea802e6315..b041e93820fc 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7882 2013/05/28 13:23:46 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7883 2013/05/28 14:48:04 blueness Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 28 May 2013; Anthony G. Basile <blueness@gentoo.org>
+ hardened/linux/uclibc/make.defaults, hardened/linux/uclibc/use.mask:
+ Unmask jit and orc, but turn them off by default on hardened/linux/uclibc
+
28 May 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
desc/video_cards.desc:
Restore mistakenly dropped i965 in VIDEO_CARDS.
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
index 3ff6b6378ffe..0daccd2b434f 100644
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ b/profiles/hardened/linux/uclibc/make.defaults
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2013 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/make.defaults,v 1.4 2012/10/25 16:06:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/make.defaults,v 1.5 2013/05/28 14:48:04 blueness Exp $
PORTAGE_LIBC="uClibc"
ELIBC=uclibc
FEATURES="sandbox sfperms strict"
-USE="hardened nptl pax_kernel pic unicode xattr -berkdb"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb"
+USE="hardened nptl pax_kernel pic unicode xattr -berkdb -jit -orc"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb -jit -orc"
SYMLINK_LIB="no"
diff --git a/profiles/hardened/linux/uclibc/use.mask b/profiles/hardened/linux/uclibc/use.mask
index 2af0481cac82..d51b1c3a33b1 100644
--- a/profiles/hardened/linux/uclibc/use.mask
+++ b/profiles/hardened/linux/uclibc/use.mask
@@ -1,14 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2013 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/use.mask,v 1.3 2012/10/25 16:06:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/use.mask,v 1.4 2013/05/28 14:48:04 blueness Exp $
nls
pam
-# JIT leads to RWX mmap denials with a PaX kernel
-jit
-orc
-
emul-linux-x86
-uclibc