Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 3/8] profiles/*/amd64/*/no-multilib: stop using features/64bit-native
Date: Sat, 21 Jan 2017 23:01:52
Message-Id: 20170121225947.11433-4-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH] Profile cleanup, pt. 2: multilib mess by "Michał Górny"
1 ---
2 profiles/arch/amd64/no-multilib/use.mask | 6 +++++-
3 profiles/default/linux/amd64/13.0/no-multilib/parent | 1 -
4 profiles/hardened/linux/amd64/no-multilib/parent | 1 -
5 profiles/hardened/linux/amd64/no-multilib/use.mask | 6 +++++-
6 4 files changed, 10 insertions(+), 4 deletions(-)
7
8 diff --git a/profiles/arch/amd64/no-multilib/use.mask b/profiles/arch/amd64/no-multilib/use.mask
9 index 7ff4d5f149a4..c32c1ba43a85 100644
10 --- a/profiles/arch/amd64/no-multilib/use.mask
11 +++ b/profiles/arch/amd64/no-multilib/use.mask
12 @@ -1,4 +1,4 @@
13 -# Copyright 1999-2013 Gentoo Foundation
14 +# Copyright 1999-2017 Gentoo Foundation
15 # Distributed under the terms of the GNU General Public License v2
16 # $Id$
17
18 @@ -12,6 +12,10 @@ mbrola
19 # Xen HVM support requires building 32-bit binaries.
20 hvm
21
22 +# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>
23 +# Mask multilib, since we cannot use it.
24 +multilib
25 +
26 # 2009/05/11 Doug Goldstein <cardoe@g.o>
27 # Mask 32bit since this will always require emulation packages
28 32bit
29 diff --git a/profiles/default/linux/amd64/13.0/no-multilib/parent b/profiles/default/linux/amd64/13.0/no-multilib/parent
30 index 521b28aab857..7f1f3bc017ee 100644
31 --- a/profiles/default/linux/amd64/13.0/no-multilib/parent
32 +++ b/profiles/default/linux/amd64/13.0/no-multilib/parent
33 @@ -1,3 +1,2 @@
34 ..
35 ../../../../../arch/amd64/no-multilib
36 -../../../../../features/64bit-native
37 diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent
38 index 0defac31415d..2909df6d3ca6 100644
39 --- a/profiles/hardened/linux/amd64/no-multilib/parent
40 +++ b/profiles/hardened/linux/amd64/no-multilib/parent
41 @@ -1,3 +1,2 @@
42 ../../../../arch/amd64/no-multilib
43 ..
44 -../../../../features/64bit-native
45 diff --git a/profiles/hardened/linux/amd64/no-multilib/use.mask b/profiles/hardened/linux/amd64/no-multilib/use.mask
46 index da6756de2671..2e9b62f80708 100644
47 --- a/profiles/hardened/linux/amd64/no-multilib/use.mask
48 +++ b/profiles/hardened/linux/amd64/no-multilib/use.mask
49 @@ -1,4 +1,4 @@
50 -# Copyright 1999-2012 Gentoo Foundation
51 +# Copyright 1999-2017 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Id$
54
55 @@ -15,6 +15,10 @@ mbrola
56 # Xen HVM support requires building 32-bit binaries.
57 hvm
58
59 +# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>
60 +# Mask multilib, since we cannot use it.
61 +multilib
62 +
63 # 2009/05/11 Doug Goldstein <cardoe@g.o>
64 # Mask 32bit since this will always require emulation packages
65 32bit
66 --
67 2.11.0