Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/13.0/no-multilib/, profiles/arch/amd64/no-multilib/, ...
Date: Wed, 01 Feb 2017 12:27:23
Message-Id: 1485952025.35bc8d2526f7f50d74c06b93b49d460bc3fa06a5.mgorny@gentoo
1 commit: 35bc8d2526f7f50d74c06b93b49d460bc3fa06a5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 21 09:54:44 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 12:27:05 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35bc8d25
7
8 profiles/*/amd64/*/no-multilib: stop using features/64bit-native
9
10 profiles/arch/amd64/no-multilib/use.mask | 6 +++++-
11 profiles/default/linux/amd64/13.0/no-multilib/parent | 1 -
12 profiles/hardened/linux/amd64/no-multilib/parent | 1 -
13 profiles/hardened/linux/amd64/no-multilib/use.mask | 6 +++++-
14 4 files changed, 10 insertions(+), 4 deletions(-)
15
16 diff --git a/profiles/arch/amd64/no-multilib/use.mask b/profiles/arch/amd64/no-multilib/use.mask
17 index 7ff4d5f..c32c1ba 100644
18 --- a/profiles/arch/amd64/no-multilib/use.mask
19 +++ b/profiles/arch/amd64/no-multilib/use.mask
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2013 Gentoo Foundation
22 +# Copyright 1999-2017 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24 # $Id$
25
26 @@ -12,6 +12,10 @@ mbrola
27 # Xen HVM support requires building 32-bit binaries.
28 hvm
29
30 +# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>
31 +# Mask multilib, since we cannot use it.
32 +multilib
33 +
34 # 2009/05/11 Doug Goldstein <cardoe@g.o>
35 # Mask 32bit since this will always require emulation packages
36 32bit
37
38 diff --git a/profiles/default/linux/amd64/13.0/no-multilib/parent b/profiles/default/linux/amd64/13.0/no-multilib/parent
39 index 521b28a..7f1f3bc 100644
40 --- a/profiles/default/linux/amd64/13.0/no-multilib/parent
41 +++ b/profiles/default/linux/amd64/13.0/no-multilib/parent
42 @@ -1,3 +1,2 @@
43 ..
44 ../../../../../arch/amd64/no-multilib
45 -../../../../../features/64bit-native
46
47 diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent
48 index 0defac3..2909df6 100644
49 --- a/profiles/hardened/linux/amd64/no-multilib/parent
50 +++ b/profiles/hardened/linux/amd64/no-multilib/parent
51 @@ -1,3 +1,2 @@
52 ../../../../arch/amd64/no-multilib
53 ..
54 -../../../../features/64bit-native
55
56 diff --git a/profiles/hardened/linux/amd64/no-multilib/use.mask b/profiles/hardened/linux/amd64/no-multilib/use.mask
57 index da6756d..2e9b62f 100644
58 --- a/profiles/hardened/linux/amd64/no-multilib/use.mask
59 +++ b/profiles/hardened/linux/amd64/no-multilib/use.mask
60 @@ -1,4 +1,4 @@
61 -# Copyright 1999-2012 Gentoo Foundation
62 +# Copyright 1999-2017 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 # $Id$
65
66 @@ -15,6 +15,10 @@ mbrola
67 # Xen HVM support requires building 32-bit binaries.
68 hvm
69
70 +# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>
71 +# Mask multilib, since we cannot use it.
72 +multilib
73 +
74 # 2009/05/11 Doug Goldstein <cardoe@g.o>
75 # Mask 32bit since this will always require emulation packages
76 32bit