diff options
author | Michał Górny <mgorny@gentoo.org> | 2017-01-21 10:54:44 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2017-02-01 13:27:05 +0100 |
commit | 35bc8d2526f7f50d74c06b93b49d460bc3fa06a5 (patch) | |
tree | b4a1d5d8583e275fa3ef12c54ca36934e4bfae1a | |
parent | profiles: Move amd64-specific masks to amd64 where they belong (diff) | |
download | gentoo-35bc8d25.tar.gz gentoo-35bc8d25.tar.bz2 gentoo-35bc8d25.zip |
profiles/*/amd64/*/no-multilib: stop using features/64bit-native
4 files changed, 10 insertions, 4 deletions
diff --git a/profiles/arch/amd64/no-multilib/use.mask b/profiles/arch/amd64/no-multilib/use.mask index 7ff4d5f149a4..c32c1ba43a85 100644 --- a/profiles/arch/amd64/no-multilib/use.mask +++ b/profiles/arch/amd64/no-multilib/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,6 +12,10 @@ mbrola # Xen HVM support requires building 32-bit binaries. hvm +# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org> +# Mask multilib, since we cannot use it. +multilib + # 2009/05/11 Doug Goldstein <cardoe@gentoo.org> # Mask 32bit since this will always require emulation packages 32bit diff --git a/profiles/default/linux/amd64/13.0/no-multilib/parent b/profiles/default/linux/amd64/13.0/no-multilib/parent index 521b28aab857..7f1f3bc017ee 100644 --- a/profiles/default/linux/amd64/13.0/no-multilib/parent +++ b/profiles/default/linux/amd64/13.0/no-multilib/parent @@ -1,3 +1,2 @@ .. ../../../../../arch/amd64/no-multilib -../../../../../features/64bit-native diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent index 0defac31415d..2909df6d3ca6 100644 --- a/profiles/hardened/linux/amd64/no-multilib/parent +++ b/profiles/hardened/linux/amd64/no-multilib/parent @@ -1,3 +1,2 @@ ../../../../arch/amd64/no-multilib .. -../../../../features/64bit-native diff --git a/profiles/hardened/linux/amd64/no-multilib/use.mask b/profiles/hardened/linux/amd64/no-multilib/use.mask index da6756de2671..2e9b62f80708 100644 --- a/profiles/hardened/linux/amd64/no-multilib/use.mask +++ b/profiles/hardened/linux/amd64/no-multilib/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,6 +15,10 @@ mbrola # Xen HVM support requires building 32-bit binaries. hvm +# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org> +# Mask multilib, since we cannot use it. +multilib + # 2009/05/11 Doug Goldstein <cardoe@gentoo.org> # Mask 32bit since this will always require emulation packages 32bit |