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: sys-devel/llvm/
Date: Wed, 13 Mar 2019 08:22:26
Message-Id: 1552463231.1f7a7694538ef2e256e1d3cb94da1cb391df9c31.mgorny@gentoo
1 commit: 1f7a7694538ef2e256e1d3cb94da1cb391df9c31
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 13 07:47:09 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 07:47:11 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7a7694
7
8 sys-devel/llvm: Update binutils dep in live ebuilds & RC
9
10 Update binutils dependency to account for USE flag rename in live
11 ebuilds and the masked RC. ~arch ebuilds are going to be updated
12 as new releases are added to avoid spurious rebuilds.
13
14 Bug: https://bugs.gentoo.org/677888
15 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
16
17 sys-devel/llvm/llvm-7.0.9999.ebuild | 7 ++++++-
18 sys-devel/llvm/llvm-8.0.0_rc5.ebuild | 7 ++++++-
19 sys-devel/llvm/llvm-8.0.9999.ebuild | 7 ++++++-
20 sys-devel/llvm/llvm-9999.ebuild | 7 ++++++-
21 4 files changed, 24 insertions(+), 4 deletions(-)
22
23 diff --git a/sys-devel/llvm/llvm-7.0.9999.ebuild b/sys-devel/llvm/llvm-7.0.9999.ebuild
24 index 9e2be474c59..c361a226832 100644
25 --- a/sys-devel/llvm/llvm-7.0.9999.ebuild
26 +++ b/sys-devel/llvm/llvm-7.0.9999.ebuild
27 @@ -42,7 +42,12 @@ RESTRICT="!test? ( test )"
28 RDEPEND="
29 sys-libs/zlib:0=
30 exegesis? ( dev-libs/libpfm:= )
31 - gold? ( >=sys-devel/binutils-2.22:*[cxx] )
32 + gold? (
33 + || (
34 + >=sys-devel/binutils-2.31.1-r4:*[plugins]
35 + <sys-devel/binutils-2.31.1-r4:*[cxx]
36 + )
37 + )
38 libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
39 libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
40 ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
41
42 diff --git a/sys-devel/llvm/llvm-8.0.0_rc5.ebuild b/sys-devel/llvm/llvm-8.0.0_rc5.ebuild
43 index 167c83db857..250137f620f 100644
44 --- a/sys-devel/llvm/llvm-8.0.0_rc5.ebuild
45 +++ b/sys-devel/llvm/llvm-8.0.0_rc5.ebuild
46 @@ -40,7 +40,12 @@ RESTRICT="!test? ( test )"
47 RDEPEND="
48 sys-libs/zlib:0=
49 exegesis? ( dev-libs/libpfm:= )
50 - gold? ( >=sys-devel/binutils-2.22:*[cxx] )
51 + gold? (
52 + || (
53 + >=sys-devel/binutils-2.31.1-r4:*[plugins]
54 + <sys-devel/binutils-2.31.1-r4:*[cxx]
55 + )
56 + )
57 libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
58 libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
59 ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
60
61 diff --git a/sys-devel/llvm/llvm-8.0.9999.ebuild b/sys-devel/llvm/llvm-8.0.9999.ebuild
62 index b31f34a9105..4d4395f2fdb 100644
63 --- a/sys-devel/llvm/llvm-8.0.9999.ebuild
64 +++ b/sys-devel/llvm/llvm-8.0.9999.ebuild
65 @@ -42,7 +42,12 @@ RESTRICT="!test? ( test )"
66 RDEPEND="
67 sys-libs/zlib:0=
68 exegesis? ( dev-libs/libpfm:= )
69 - gold? ( >=sys-devel/binutils-2.22:*[cxx] )
70 + gold? (
71 + || (
72 + >=sys-devel/binutils-2.31.1-r4:*[plugins]
73 + <sys-devel/binutils-2.31.1-r4:*[cxx]
74 + )
75 + )
76 libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
77 libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
78 ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
79
80 diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
81 index abc5f6f5ebd..0da81c25c4c 100644
82 --- a/sys-devel/llvm/llvm-9999.ebuild
83 +++ b/sys-devel/llvm/llvm-9999.ebuild
84 @@ -44,7 +44,12 @@ RESTRICT="!test? ( test )"
85 RDEPEND="
86 sys-libs/zlib:0=
87 exegesis? ( dev-libs/libpfm:= )
88 - gold? ( >=sys-devel/binutils-2.22:*[cxx] )
89 + gold? (
90 + || (
91 + >=sys-devel/binutils-2.31.1-r4:*[plugins]
92 + <sys-devel/binutils-2.31.1-r4:*[cxx]
93 + )
94 + )
95 libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
96 libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
97 ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )