From a2b82624c6e3816c95c9c9984a00bfd3ff5ba37b Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Mon, 25 Feb 2013 22:17:47 +0000 Subject: Mask abi_x86_32 in 64bit-native profile since no-multilib is not used by hardened. --- profiles/features/64bit-native/use.mask | 8 ++++++-- profiles/features/ChangeLog | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'profiles/features') 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 # Mask 32bit since this will always require emulation packages 32bit + +# Michał Górny (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 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 selinux/package.mask: Adding entry for selinux-googletalk -- cgit v1.2.3-65-gdbad