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/arch/amd64/x32/, profiles/arch/amd64/no-multilib/, ...
Date: Sat, 08 Apr 2017 05:42:53
Message-Id: 1491630164.b74d16920a09aa6a9bf814add95dfb6539ff22f3.mgorny@gentoo
1 commit: b74d16920a09aa6a9bf814add95dfb6539ff22f3
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 8 05:41:36 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 8 05:42:44 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74d1692
7
8 profiles/arch/amd64*: force full multilib on sys-apps/sandbox, #611292
9
10 profiles/arch/amd64-fbsd/package.use.force | 7 ++++++-
11 profiles/arch/amd64/no-multilib/package.use.force | 6 ++++++
12 profiles/arch/amd64/package.use.force | 7 ++++++-
13 profiles/arch/amd64/x32/package.use.force | 7 +++++++
14 4 files changed, 25 insertions(+), 2 deletions(-)
15
16 diff --git a/profiles/arch/amd64-fbsd/package.use.force b/profiles/arch/amd64-fbsd/package.use.force
17 index 8025d872db4..b3a9e1d3fe1 100644
18 --- a/profiles/arch/amd64-fbsd/package.use.force
19 +++ b/profiles/arch/amd64-fbsd/package.use.force
20 @@ -1,6 +1,11 @@
21 -# Copyright 1999-2016 Gentoo Foundation
22 +# Copyright 1999-2017 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24
25 +# Michał Górny <mgorny@g.o> (08 Apr 2017)
26 +# Require sandbox to be multilib-capable to avoid failures when building
27 +# multilib packages, #611292.
28 +sys-apps/sandbox abi_x86_32
29 +
30 # Michał Górny <mgorny@g.o> (24 Sep 2016)
31 # Force the host target to avoid dependency hell
32 sys-devel/clang llvm_targets_X86
33
34 diff --git a/profiles/arch/amd64/no-multilib/package.use.force b/profiles/arch/amd64/no-multilib/package.use.force
35 new file mode 100644
36 index 00000000000..0f2c76d1c72
37 --- /dev/null
38 +++ b/profiles/arch/amd64/no-multilib/package.use.force
39 @@ -0,0 +1,6 @@
40 +# Copyright 1999-2017 Gentoo Foundation
41 +# Distributed under the terms of the GNU General Public License v2
42 +
43 +# Michał Górny <mgorny@g.o> (08 Apr 2017)
44 +# Undo multilib forcing.
45 +sys-apps/sandbox -abi_x86_32
46
47 diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
48 index ab5831aebbc..c267fe03e14 100644
49 --- a/profiles/arch/amd64/package.use.force
50 +++ b/profiles/arch/amd64/package.use.force
51 @@ -1,6 +1,11 @@
52 -# Copyright 1999-2016 Gentoo Foundation
53 +# Copyright 1999-2017 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55
56 +# Michał Górny <mgorny@g.o> (08 Apr 2017)
57 +# Require sandbox to be multilib-capable to avoid failures when building
58 +# multilib packages, #611292.
59 +sys-apps/sandbox abi_x86_32
60 +
61 # Michał Górny <mgorny@g.o> (24 Sep 2016)
62 # Force the host target to avoid dependency hell
63 sys-devel/clang llvm_targets_X86
64
65 diff --git a/profiles/arch/amd64/x32/package.use.force b/profiles/arch/amd64/x32/package.use.force
66 new file mode 100644
67 index 00000000000..104f780e302
68 --- /dev/null
69 +++ b/profiles/arch/amd64/x32/package.use.force
70 @@ -0,0 +1,7 @@
71 +# Copyright 1999-2017 Gentoo Foundation
72 +# Distributed under the terms of the GNU General Public License v2
73 +
74 +# Michał Górny <mgorny@g.o> (08 Apr 2017)
75 +# Require sandbox to be multilib-capable to avoid failures when building
76 +# multilib packages, #611292.
77 +sys-apps/sandbox abi_x86_64