1 |
commit: c5ac996b9f30b2b6221a67116b4e722cdb2c91e1 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 3 20:52:10 2018 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 3 20:52:24 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ac996b |
7 |
|
8 |
sys-devel/binutils-apple: fix llvm slot-dep |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild | 6 +++--- |
13 |
sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild | 8 ++++---- |
14 |
sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild | 8 ++++---- |
15 |
sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild | 8 ++++---- |
16 |
sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild | 4 ++-- |
17 |
sys-devel/binutils-apple/binutils-apple-7.0.ebuild | 4 ++-- |
18 |
sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild | 4 ++-- |
19 |
sys-devel/binutils-apple/binutils-apple-7.1.ebuild | 4 ++-- |
20 |
sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild | 4 ++-- |
21 |
sys-devel/binutils-apple/binutils-apple-7.2.ebuild | 4 ++-- |
22 |
sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild | 4 ++-- |
23 |
sys-devel/binutils-apple/binutils-apple-7.3.ebuild | 4 ++-- |
24 |
sys-devel/binutils-apple/binutils-apple-8.1.ebuild | 4 ++-- |
25 |
sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild | 6 +++--- |
26 |
sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild | 4 ++-- |
27 |
15 files changed, 38 insertions(+), 38 deletions(-) |
28 |
|
29 |
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild |
30 |
index 5131c4f35b9..021608d4682 100644 |
31 |
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild |
32 |
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild |
33 |
@@ -1,4 +1,4 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
+# Copyright 1999-2018 Gentoo Foundation |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
EAPI="5" |
39 |
@@ -26,10 +26,10 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" |
40 |
IUSE="lto test multitarget" |
41 |
|
42 |
RDEPEND="sys-devel/binutils-config |
43 |
- lto? ( sys-devel/llvm )" |
44 |
+ lto? ( sys-devel/llvm:* )" |
45 |
DEPEND="${RDEPEND} |
46 |
test? ( >=dev-lang/perl-5.8.8 ) |
47 |
- || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )" |
48 |
+ || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )" |
49 |
|
50 |
SLOT="4" |
51 |
|
52 |
|
53 |
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild |
54 |
index 507c8b54be1..4920826c016 100644 |
55 |
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild |
56 |
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild |
57 |
@@ -1,4 +1,4 @@ |
58 |
-# Copyright 1999-2017 Gentoo Foundation |
59 |
+# Copyright 1999-2018 Gentoo Foundation |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
|
62 |
EAPI="5" |
63 |
@@ -25,12 +25,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" |
64 |
IUSE="lto test libcxx multitarget" |
65 |
|
66 |
RDEPEND="sys-devel/binutils-config |
67 |
- lto? ( sys-devel/llvm ) |
68 |
+ lto? ( sys-devel/llvm:* ) |
69 |
libcxx? ( sys-libs/libcxx )" |
70 |
DEPEND="${RDEPEND} |
71 |
test? ( >=dev-lang/perl-5.8.8 ) |
72 |
- || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) |
73 |
- libcxx? ( sys-devel/llvm )" |
74 |
+ || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* ) |
75 |
+ libcxx? ( sys-devel/llvm:* )" |
76 |
|
77 |
SLOT="5" |
78 |
|
79 |
|
80 |
diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild |
81 |
index 984b3131982..bd320244231 100644 |
82 |
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild |
83 |
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild |
84 |
@@ -1,4 +1,4 @@ |
85 |
-# Copyright 1999-2017 Gentoo Foundation |
86 |
+# Copyright 1999-2018 Gentoo Foundation |
87 |
# Distributed under the terms of the GNU General Public License v2 |
88 |
|
89 |
EAPI="5" |
90 |
@@ -26,12 +26,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" |
91 |
IUSE="lto test libcxx multitarget" |
92 |
|
93 |
RDEPEND="sys-devel/binutils-config |
94 |
- lto? ( sys-devel/llvm ) |
95 |
+ lto? ( sys-devel/llvm:* ) |
96 |
libcxx? ( sys-libs/libcxx )" |
97 |
DEPEND="${RDEPEND} |
98 |
test? ( >=dev-lang/perl-5.8.8 ) |
99 |
- || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) |
100 |
- libcxx? ( sys-devel/llvm )" |
101 |
+ || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* ) |
102 |
+ libcxx? ( sys-devel/llvm:* )" |
103 |
|
104 |
SLOT="6" |
105 |
|
106 |
|
107 |
diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild |
108 |
index 371c6a2b6c6..5835b8852a0 100644 |
109 |
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild |
110 |
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild |
111 |
@@ -1,4 +1,4 @@ |
112 |
-# Copyright 1999-2017 Gentoo Foundation |
113 |
+# Copyright 1999-2018 Gentoo Foundation |
114 |
# Distributed under the terms of the GNU General Public License v2 |
115 |
|
116 |
EAPI="5" |
117 |
@@ -27,12 +27,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" |
118 |
IUSE="lto test libcxx multitarget" |
119 |
|
120 |
RDEPEND="sys-devel/binutils-config |
121 |
- lto? ( sys-devel/llvm ) |
122 |
+ lto? ( sys-devel/llvm:* ) |
123 |
libcxx? ( sys-libs/libcxx )" |
124 |
DEPEND="${RDEPEND} |
125 |
test? ( >=dev-lang/perl-5.8.8 ) |
126 |
- || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) |
127 |
- libcxx? ( sys-devel/llvm )" |
128 |
+ || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* ) |
129 |
+ libcxx? ( sys-devel/llvm:* )" |
130 |
|
131 |
SLOT="6" |
132 |
|
133 |
|
134 |
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild |
135 |
index 2eab5e95aab..039399257b2 100644 |
136 |
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild |
137 |
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild |
138 |
@@ -1,4 +1,4 @@ |
139 |
-# Copyright 1999-2017 Gentoo Foundation |
140 |
+# Copyright 1999-2018 Gentoo Foundation |
141 |
# Distributed under the terms of the GNU General Public License v2 |
142 |
|
143 |
EAPI="5" |
144 |
@@ -33,7 +33,7 @@ IUSE="lto test multitarget" |
145 |
# -Wa,-Q but since it's default we make llvm a static runtime dependency. |
146 |
RDEPEND="sys-devel/binutils-config |
147 |
lto? ( app-arch/xar ) |
148 |
- sys-devel/llvm |
149 |
+ sys-devel/llvm:* |
150 |
sys-libs/libcxx" |
151 |
DEPEND="${RDEPEND} |
152 |
test? ( >=dev-lang/perl-5.8.8 )" |
153 |
|
154 |
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild |
155 |
index c81eb3fe54e..805b4d51e50 100644 |
156 |
--- a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild |
157 |
+++ b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild |
158 |
@@ -1,4 +1,4 @@ |
159 |
-# Copyright 1999-2017 Gentoo Foundation |
160 |
+# Copyright 1999-2018 Gentoo Foundation |
161 |
# Distributed under the terms of the GNU General Public License v2 |
162 |
|
163 |
EAPI="5" |
164 |
@@ -38,7 +38,7 @@ IUSE="test multitarget" |
165 |
# indirectly makes xar a static runtime dependency. |
166 |
RDEPEND="sys-devel/binutils-config |
167 |
app-arch/xar |
168 |
- sys-devel/llvm |
169 |
+ sys-devel/llvm:* |
170 |
sys-libs/libcxx" |
171 |
DEPEND="${RDEPEND} |
172 |
test? ( >=dev-lang/perl-5.8.8 )" |
173 |
|
174 |
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild |
175 |
index 6b57a7444fd..6ee67d9bd04 100644 |
176 |
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild |
177 |
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild |
178 |
@@ -1,4 +1,4 @@ |
179 |
-# Copyright 1999-2017 Gentoo Foundation |
180 |
+# Copyright 1999-2018 Gentoo Foundation |
181 |
# Distributed under the terms of the GNU General Public License v2 |
182 |
|
183 |
EAPI="5" |
184 |
@@ -33,7 +33,7 @@ IUSE="lto test multitarget" |
185 |
# -Wa,-Q but since it's default we make llvm a static runtime dependency. |
186 |
RDEPEND="sys-devel/binutils-config |
187 |
lto? ( app-arch/xar ) |
188 |
- sys-devel/llvm |
189 |
+ sys-devel/llvm:* |
190 |
sys-libs/libcxx" |
191 |
DEPEND="${RDEPEND} |
192 |
test? ( >=dev-lang/perl-5.8.8 )" |
193 |
|
194 |
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild |
195 |
index 9dfebf05d00..ed6be55fb9a 100644 |
196 |
--- a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild |
197 |
+++ b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild |
198 |
@@ -1,4 +1,4 @@ |
199 |
-# Copyright 1999-2017 Gentoo Foundation |
200 |
+# Copyright 1999-2018 Gentoo Foundation |
201 |
# Distributed under the terms of the GNU General Public License v2 |
202 |
|
203 |
EAPI="5" |
204 |
@@ -38,7 +38,7 @@ IUSE="test multitarget" |
205 |
# indirectly makes xar a static runtime dependency. |
206 |
RDEPEND="sys-devel/binutils-config |
207 |
app-arch/xar |
208 |
- sys-devel/llvm |
209 |
+ sys-devel/llvm:* |
210 |
sys-libs/libcxx" |
211 |
DEPEND="${RDEPEND} |
212 |
test? ( >=dev-lang/perl-5.8.8 )" |
213 |
|
214 |
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild |
215 |
index e5de0f0f786..8cae70ffc66 100644 |
216 |
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild |
217 |
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild |
218 |
@@ -1,4 +1,4 @@ |
219 |
-# Copyright 1999-2017 Gentoo Foundation |
220 |
+# Copyright 1999-2018 Gentoo Foundation |
221 |
# Distributed under the terms of the GNU General Public License v2 |
222 |
|
223 |
EAPI="5" |
224 |
@@ -34,7 +34,7 @@ IUSE="lto test multitarget" |
225 |
# -Wa,-Q but since it's default we make llvm a static runtime dependency. |
226 |
RDEPEND="sys-devel/binutils-config |
227 |
lto? ( app-arch/xar ) |
228 |
- sys-devel/llvm |
229 |
+ sys-devel/llvm:* |
230 |
sys-libs/libcxx" |
231 |
DEPEND="${RDEPEND} |
232 |
test? ( >=dev-lang/perl-5.8.8 )" |
233 |
|
234 |
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild |
235 |
index 0f608625bca..4f76f80df25 100644 |
236 |
--- a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild |
237 |
+++ b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild |
238 |
@@ -1,4 +1,4 @@ |
239 |
-# Copyright 1999-2017 Gentoo Foundation |
240 |
+# Copyright 1999-2018 Gentoo Foundation |
241 |
# Distributed under the terms of the GNU General Public License v2 |
242 |
|
243 |
EAPI="5" |
244 |
@@ -38,7 +38,7 @@ IUSE="test multitarget" |
245 |
# indirectly makes xar a static runtime dependency. |
246 |
RDEPEND="sys-devel/binutils-config |
247 |
app-arch/xar |
248 |
- sys-devel/llvm |
249 |
+ sys-devel/llvm:* |
250 |
sys-libs/libcxx" |
251 |
DEPEND="${RDEPEND} |
252 |
test? ( >=dev-lang/perl-5.8.8 )" |
253 |
|
254 |
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild |
255 |
index e56d422a78c..1fc16db7730 100644 |
256 |
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild |
257 |
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild |
258 |
@@ -1,4 +1,4 @@ |
259 |
-# Copyright 1999-2017 Gentoo Foundation |
260 |
+# Copyright 1999-2018 Gentoo Foundation |
261 |
# Distributed under the terms of the GNU General Public License v2 |
262 |
|
263 |
EAPI="5" |
264 |
@@ -35,7 +35,7 @@ IUSE="lto test multitarget" |
265 |
# -Wa,-Q but since it's default we make llvm a static runtime dependency. |
266 |
RDEPEND="sys-devel/binutils-config |
267 |
lto? ( app-arch/xar ) |
268 |
- sys-devel/llvm |
269 |
+ sys-devel/llvm:* |
270 |
sys-libs/libcxx" |
271 |
DEPEND="${RDEPEND} |
272 |
test? ( >=dev-lang/perl-5.8.8 )" |
273 |
|
274 |
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild |
275 |
index 26f629c41ee..853dba37052 100644 |
276 |
--- a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild |
277 |
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild |
278 |
@@ -1,4 +1,4 @@ |
279 |
-# Copyright 1999-2017 Gentoo Foundation |
280 |
+# Copyright 1999-2018 Gentoo Foundation |
281 |
# Distributed under the terms of the GNU General Public License v2 |
282 |
|
283 |
EAPI="5" |
284 |
@@ -35,7 +35,7 @@ IUSE="lto test multitarget" |
285 |
# -Wa,-Q but since it's default we make llvm a static runtime dependency. |
286 |
RDEPEND="sys-devel/binutils-config |
287 |
lto? ( app-arch/xar ) |
288 |
- sys-devel/llvm |
289 |
+ sys-devel/llvm:* |
290 |
sys-libs/libcxx" |
291 |
DEPEND="${RDEPEND} |
292 |
test? ( >=dev-lang/perl-5.8.8 )" |
293 |
|
294 |
diff --git a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild |
295 |
index d5ad6ab38a9..32405f72fca 100644 |
296 |
--- a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild |
297 |
+++ b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild |
298 |
@@ -1,4 +1,4 @@ |
299 |
-# Copyright 1999-2017 Gentoo Foundation |
300 |
+# Copyright 1999-2018 Gentoo Foundation |
301 |
# Distributed under the terms of the GNU General Public License v2 |
302 |
|
303 |
EAPI="6" |
304 |
@@ -32,7 +32,7 @@ IUSE="lto tapi classic test" |
305 |
RDEPEND="sys-devel/binutils-config |
306 |
lto? ( app-arch/xar ) |
307 |
tapi? ( sys-libs/tapi ) |
308 |
- sys-devel/llvm |
309 |
+ sys-devel/llvm:* |
310 |
sys-libs/libcxx" |
311 |
DEPEND="${RDEPEND} |
312 |
test? ( >=dev-lang/perl-5.8.8 )" |
313 |
|
314 |
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild |
315 |
index bf8351a7b24..781aff39edf 100644 |
316 |
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild |
317 |
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild |
318 |
@@ -1,4 +1,4 @@ |
319 |
-# Copyright 1999-2017 Gentoo Foundation |
320 |
+# Copyright 1999-2018 Gentoo Foundation |
321 |
# Distributed under the terms of the GNU General Public License v2 |
322 |
|
323 |
EAPI="6" |
324 |
@@ -31,7 +31,7 @@ IUSE="lto tapi classic test" |
325 |
RDEPEND="sys-devel/binutils-config |
326 |
lto? ( app-arch/xar ) |
327 |
tapi? ( sys-libs/tapi ) |
328 |
- sys-devel/llvm |
329 |
+ sys-devel/llvm:* |
330 |
sys-libs/libcxx" |
331 |
DEPEND="${RDEPEND} |
332 |
test? ( >=dev-lang/perl-5.8.8 )" |
333 |
@@ -200,7 +200,7 @@ compile_ld64() { |
334 |
LTO_INCDIR=${LLVM_INCDIR} \ |
335 |
LTO_LIBDIR=${LLVM_LIBDIR} \ |
336 |
TAPI=$(use tapi && echo 1 || echo 0) \ |
337 |
- TAPI_LIBDIR=${EPREFIX}/usr/lib \ |
338 |
+ TAPI_LIBDIR="${EPREFIX}"/usr/lib \ |
339 |
|| die "emake failed for ld64" |
340 |
use test && emake build_test |
341 |
} |
342 |
|
343 |
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild |
344 |
index 9cf67823890..11fae811996 100644 |
345 |
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild |
346 |
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild |
347 |
@@ -1,4 +1,4 @@ |
348 |
-# Copyright 1999-2017 Gentoo Foundation |
349 |
+# Copyright 1999-2018 Gentoo Foundation |
350 |
# Distributed under the terms of the GNU General Public License v2 |
351 |
|
352 |
EAPI="6" |
353 |
@@ -32,7 +32,7 @@ IUSE="lto tapi classic test" |
354 |
RDEPEND="sys-devel/binutils-config |
355 |
lto? ( app-arch/xar ) |
356 |
tapi? ( sys-libs/tapi ) |
357 |
- sys-devel/llvm |
358 |
+ sys-devel/llvm:* |
359 |
sys-libs/libcxx" |
360 |
DEPEND="${RDEPEND} |
361 |
test? ( >=dev-lang/perl-5.8.8 )" |