summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-02-25 22:17:47 +0000
committerMichał Górny <mgorny@gentoo.org>2013-02-25 22:17:47 +0000
commit2843f7cf47c12a539a8230c96dee2a5b569d1c87 (patch)
treecaa4a281964cbfbf86f0179c9ace50638300a182 /profiles
parentStable for ppc64, wrt bug #459166 (diff)
downloadhistorical-2843f7cf47c12a539a8230c96dee2a5b569d1c87.tar.gz
historical-2843f7cf47c12a539a8230c96dee2a5b569d1c87.tar.bz2
historical-2843f7cf47c12a539a8230c96dee2a5b569d1c87.zip
Mask abi_x86_32 in 64bit-native profile since no-multilib is not used by hardened.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/features/64bit-native/use.mask8
-rw-r--r--profiles/features/ChangeLog8
2 files changed, 12 insertions, 4 deletions
diff --git a/profiles/features/64bit-native/use.mask b/profiles/features/64bit-native/use.mask
index 05f387bc471e..3731186b6e22 100644
--- a/profiles/features/64bit-native/use.mask
+++ b/profiles/features/64bit-native/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/use.mask,v 1.7 2009/10/14 19:57:33 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/use.mask,v 1.8 2013/02/25 22:17:47 mgorny Exp $
# USE flags masked because providing packages require a 32-bit ABI
@@ -19,3 +19,7 @@ multilib
# 2009/05/11 Doug Goldstein <cardoe@gentoo.org>
# Mask 32bit since this will always require emulation packages
32bit
+
+# Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
+# Mask the multilib flags back for non-multilib profile.
+abi_x86_32
diff --git a/profiles/features/ChangeLog b/profiles/features/ChangeLog
index c828fec15d6d..f6e4f1a6cda5 100644
--- a/profiles/features/ChangeLog
+++ b/profiles/features/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo/AMD64 profile directory
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.58 2012/12/30 19:43:11 swift Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.59 2013/02/25 22:17:47 mgorny Exp $
+
+ 25 Feb 2013; Michał Górny <mgorny@gentoo.org> 64bit-native/use.mask:
+ Mask abi_x86_32 in 64bit-native profile since no-multilib is not used by
+ hardened.
30 Dec 2012; Sven Vermeulen <swift@gentoo.org> selinux/package.mask:
Adding entry for selinux-googletalk