1 |
commit: ac398431d5c1ef8d5e237d2cd47c1b4a867c526a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 29 22:39:10 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 29 22:43:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac398431 |
7 |
|
8 |
sys-cluster/legion: add hwloc subslot operator |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
...-16.08.0-r1.ebuild => legion-16.08.0-r2.ebuild} | 5 +-- |
13 |
...ion-16.10.0.ebuild => legion-16.10.0-r1.ebuild} | 5 +-- |
14 |
...ion-17.02.0.ebuild => legion-17.02.0-r1.ebuild} | 5 +-- |
15 |
...ion-17.05.0.ebuild => legion-17.05.0-r1.ebuild} | 3 +- |
16 |
...ion-17.08.0.ebuild => legion-17.08.0-r1.ebuild} | 3 +- |
17 |
...ion-17.10.0.ebuild => legion-17.10.0-r1.ebuild} | 3 +- |
18 |
...ion-18.02.0.ebuild => legion-18.02.0-r1.ebuild} | 3 +- |
19 |
...ion-18.05.0.ebuild => legion-18.05.0-r1.ebuild} | 3 +- |
20 |
...ion-17.08.0.ebuild => legion-18.12.0-r1.ebuild} | 3 +- |
21 |
sys-cluster/legion/legion-18.12.0.ebuild | 40 ---------------------- |
22 |
...ion-17.08.0.ebuild => legion-19.06.0-r1.ebuild} | 3 +- |
23 |
sys-cluster/legion/legion-19.06.0.ebuild | 40 ---------------------- |
24 |
sys-cluster/legion/legion-9999.ebuild | 3 +- |
25 |
13 files changed, 25 insertions(+), 94 deletions(-) |
26 |
|
27 |
diff --git a/sys-cluster/legion/legion-16.08.0-r1.ebuild b/sys-cluster/legion/legion-16.08.0-r2.ebuild |
28 |
similarity index 90% |
29 |
rename from sys-cluster/legion/legion-16.08.0-r1.ebuild |
30 |
rename to sys-cluster/legion/legion-16.08.0-r2.ebuild |
31 |
index c785d40df28..7295a5f41e4 100644 |
32 |
--- a/sys-cluster/legion/legion-16.08.0-r1.ebuild |
33 |
+++ b/sys-cluster/legion/legion-16.08.0-r2.ebuild |
34 |
@@ -1,4 +1,4 @@ |
35 |
-# Copyright 1999-2019 Gentoo Authors |
36 |
+# Copyright 1999-2021 Gentoo Authors |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
EAPI=6 |
40 |
@@ -16,8 +16,9 @@ IUSE="gasnet +hwloc" |
41 |
|
42 |
DEPEND=" |
43 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
44 |
- hwloc? ( sys-apps/hwloc ) |
45 |
+ hwloc? ( sys-apps/hwloc:= ) |
46 |
" |
47 |
+RDEPEND="${DEPEND}" |
48 |
|
49 |
S="${WORKDIR}/${PN}-${P}" |
50 |
|
51 |
|
52 |
diff --git a/sys-cluster/legion/legion-16.10.0.ebuild b/sys-cluster/legion/legion-16.10.0-r1.ebuild |
53 |
similarity index 87% |
54 |
rename from sys-cluster/legion/legion-16.10.0.ebuild |
55 |
rename to sys-cluster/legion/legion-16.10.0-r1.ebuild |
56 |
index 6ed64ffe46d..50372479f2c 100644 |
57 |
--- a/sys-cluster/legion/legion-16.10.0.ebuild |
58 |
+++ b/sys-cluster/legion/legion-16.10.0-r1.ebuild |
59 |
@@ -1,4 +1,4 @@ |
60 |
-# Copyright 1999-2019 Gentoo Authors |
61 |
+# Copyright 1999-2021 Gentoo Authors |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
|
64 |
EAPI=6 |
65 |
@@ -16,8 +16,9 @@ IUSE="gasnet +hwloc" |
66 |
|
67 |
DEPEND=" |
68 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
69 |
- hwloc? ( sys-apps/hwloc ) |
70 |
+ hwloc? ( sys-apps/hwloc:= ) |
71 |
" |
72 |
+RDEPEND="${DEPEND}" |
73 |
|
74 |
S="${WORKDIR}/${PN}-${P}" |
75 |
|
76 |
|
77 |
diff --git a/sys-cluster/legion/legion-17.02.0.ebuild b/sys-cluster/legion/legion-17.02.0-r1.ebuild |
78 |
similarity index 88% |
79 |
rename from sys-cluster/legion/legion-17.02.0.ebuild |
80 |
rename to sys-cluster/legion/legion-17.02.0-r1.ebuild |
81 |
index 415747a8aa6..4ab8ed801e4 100644 |
82 |
--- a/sys-cluster/legion/legion-17.02.0.ebuild |
83 |
+++ b/sys-cluster/legion/legion-17.02.0-r1.ebuild |
84 |
@@ -1,4 +1,4 @@ |
85 |
-# Copyright 1999-2019 Gentoo Authors |
86 |
+# Copyright 1999-2021 Gentoo Authors |
87 |
# Distributed under the terms of the GNU General Public License v2 |
88 |
|
89 |
EAPI=6 |
90 |
@@ -16,8 +16,9 @@ IUSE="gasnet +hwloc" |
91 |
|
92 |
DEPEND=" |
93 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
94 |
- hwloc? ( sys-apps/hwloc ) |
95 |
+ hwloc? ( sys-apps/hwloc:= ) |
96 |
" |
97 |
+RDEPEND="${DEPEND}" |
98 |
|
99 |
S="${WORKDIR}/${PN}-${P}" |
100 |
|
101 |
|
102 |
diff --git a/sys-cluster/legion/legion-17.05.0.ebuild b/sys-cluster/legion/legion-17.05.0-r1.ebuild |
103 |
similarity index 94% |
104 |
rename from sys-cluster/legion/legion-17.05.0.ebuild |
105 |
rename to sys-cluster/legion/legion-17.05.0-r1.ebuild |
106 |
index d54f220af2c..0746074ce71 100644 |
107 |
--- a/sys-cluster/legion/legion-17.05.0.ebuild |
108 |
+++ b/sys-cluster/legion/legion-17.05.0-r1.ebuild |
109 |
@@ -22,8 +22,9 @@ IUSE="gasnet +hwloc" |
110 |
|
111 |
DEPEND=" |
112 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
113 |
- hwloc? ( sys-apps/hwloc ) |
114 |
+ hwloc? ( sys-apps/hwloc:= ) |
115 |
" |
116 |
+RDEPEND="${DEPEND}" |
117 |
|
118 |
src_configure() { |
119 |
mycmakeargs=( |
120 |
|
121 |
diff --git a/sys-cluster/legion/legion-17.08.0.ebuild b/sys-cluster/legion/legion-17.08.0-r1.ebuild |
122 |
similarity index 94% |
123 |
copy from sys-cluster/legion/legion-17.08.0.ebuild |
124 |
copy to sys-cluster/legion/legion-17.08.0-r1.ebuild |
125 |
index b2a4fc2de9c..c883f98f82d 100644 |
126 |
--- a/sys-cluster/legion/legion-17.08.0.ebuild |
127 |
+++ b/sys-cluster/legion/legion-17.08.0-r1.ebuild |
128 |
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )" |
129 |
|
130 |
DEPEND=" |
131 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
132 |
- hwloc? ( sys-apps/hwloc ) |
133 |
+ hwloc? ( sys-apps/hwloc:= ) |
134 |
" |
135 |
+RDEPEND="${DEPEND}" |
136 |
|
137 |
src_configure() { |
138 |
mycmakeargs=( |
139 |
|
140 |
diff --git a/sys-cluster/legion/legion-17.10.0.ebuild b/sys-cluster/legion/legion-17.10.0-r1.ebuild |
141 |
similarity index 94% |
142 |
rename from sys-cluster/legion/legion-17.10.0.ebuild |
143 |
rename to sys-cluster/legion/legion-17.10.0-r1.ebuild |
144 |
index b2a4fc2de9c..c883f98f82d 100644 |
145 |
--- a/sys-cluster/legion/legion-17.10.0.ebuild |
146 |
+++ b/sys-cluster/legion/legion-17.10.0-r1.ebuild |
147 |
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )" |
148 |
|
149 |
DEPEND=" |
150 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
151 |
- hwloc? ( sys-apps/hwloc ) |
152 |
+ hwloc? ( sys-apps/hwloc:= ) |
153 |
" |
154 |
+RDEPEND="${DEPEND}" |
155 |
|
156 |
src_configure() { |
157 |
mycmakeargs=( |
158 |
|
159 |
diff --git a/sys-cluster/legion/legion-18.02.0.ebuild b/sys-cluster/legion/legion-18.02.0-r1.ebuild |
160 |
similarity index 94% |
161 |
rename from sys-cluster/legion/legion-18.02.0.ebuild |
162 |
rename to sys-cluster/legion/legion-18.02.0-r1.ebuild |
163 |
index b2a4fc2de9c..c883f98f82d 100644 |
164 |
--- a/sys-cluster/legion/legion-18.02.0.ebuild |
165 |
+++ b/sys-cluster/legion/legion-18.02.0-r1.ebuild |
166 |
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )" |
167 |
|
168 |
DEPEND=" |
169 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
170 |
- hwloc? ( sys-apps/hwloc ) |
171 |
+ hwloc? ( sys-apps/hwloc:= ) |
172 |
" |
173 |
+RDEPEND="${DEPEND}" |
174 |
|
175 |
src_configure() { |
176 |
mycmakeargs=( |
177 |
|
178 |
diff --git a/sys-cluster/legion/legion-18.05.0.ebuild b/sys-cluster/legion/legion-18.05.0-r1.ebuild |
179 |
similarity index 94% |
180 |
rename from sys-cluster/legion/legion-18.05.0.ebuild |
181 |
rename to sys-cluster/legion/legion-18.05.0-r1.ebuild |
182 |
index c9eb5be36ea..bc5ad7cee85 100644 |
183 |
--- a/sys-cluster/legion/legion-18.05.0.ebuild |
184 |
+++ b/sys-cluster/legion/legion-18.05.0-r1.ebuild |
185 |
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )" |
186 |
|
187 |
DEPEND=" |
188 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
189 |
- hwloc? ( <sys-apps/hwloc-2 ) |
190 |
+ hwloc? ( <sys-apps/hwloc-2:= ) |
191 |
" |
192 |
+RDEPEND="${DEPEND}" |
193 |
|
194 |
src_configure() { |
195 |
mycmakeargs=( |
196 |
|
197 |
diff --git a/sys-cluster/legion/legion-17.08.0.ebuild b/sys-cluster/legion/legion-18.12.0-r1.ebuild |
198 |
similarity index 94% |
199 |
copy from sys-cluster/legion/legion-17.08.0.ebuild |
200 |
copy to sys-cluster/legion/legion-18.12.0-r1.ebuild |
201 |
index b2a4fc2de9c..bc5ad7cee85 100644 |
202 |
--- a/sys-cluster/legion/legion-17.08.0.ebuild |
203 |
+++ b/sys-cluster/legion/legion-18.12.0-r1.ebuild |
204 |
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )" |
205 |
|
206 |
DEPEND=" |
207 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
208 |
- hwloc? ( sys-apps/hwloc ) |
209 |
+ hwloc? ( <sys-apps/hwloc-2:= ) |
210 |
" |
211 |
+RDEPEND="${DEPEND}" |
212 |
|
213 |
src_configure() { |
214 |
mycmakeargs=( |
215 |
|
216 |
diff --git a/sys-cluster/legion/legion-18.12.0.ebuild b/sys-cluster/legion/legion-18.12.0.ebuild |
217 |
deleted file mode 100644 |
218 |
index c9eb5be36ea..00000000000 |
219 |
--- a/sys-cluster/legion/legion-18.12.0.ebuild |
220 |
+++ /dev/null |
221 |
@@ -1,40 +0,0 @@ |
222 |
-# Copyright 1999-2021 Gentoo Authors |
223 |
-# Distributed under the terms of the GNU General Public License v2 |
224 |
- |
225 |
-EAPI=6 |
226 |
- |
227 |
-inherit cmake-utils |
228 |
- |
229 |
-DESCRIPTION="A data-centric parallel programming system" |
230 |
-HOMEPAGE="https://legion.stanford.edu/" |
231 |
-if [[ ${PV} = 9999 ]]; then |
232 |
- inherit git-r3 |
233 |
- EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git" |
234 |
-else |
235 |
- SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz" |
236 |
- KEYWORDS="~amd64" |
237 |
- S="${WORKDIR}/${PN}-${P}" |
238 |
-fi |
239 |
- |
240 |
-LICENSE="BSD" |
241 |
-SLOT="0" |
242 |
-IUSE="gasnet +hwloc test" |
243 |
-RESTRICT="!test? ( test )" |
244 |
- |
245 |
-DEPEND=" |
246 |
- gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
247 |
- hwloc? ( <sys-apps/hwloc-2 ) |
248 |
- " |
249 |
- |
250 |
-src_configure() { |
251 |
- mycmakeargs=( |
252 |
- -DLegion_USE_HWLOC=$(usex hwloc) |
253 |
- -DLegion_USE_GASNet=$(usex gasnet) |
254 |
- -DLegion_ENABLE_TESTING=$(usex test) |
255 |
- -DBUILD_SHARED_LIBS=ON |
256 |
- -DLegion_BUILD_EXAMPLES=ON |
257 |
- -DLegion_BUILD_TESTS=ON |
258 |
- -DLegion_BUILD_TUTORIAL=ON |
259 |
- ) |
260 |
- cmake-utils_src_configure |
261 |
-} |
262 |
|
263 |
diff --git a/sys-cluster/legion/legion-17.08.0.ebuild b/sys-cluster/legion/legion-19.06.0-r1.ebuild |
264 |
similarity index 94% |
265 |
rename from sys-cluster/legion/legion-17.08.0.ebuild |
266 |
rename to sys-cluster/legion/legion-19.06.0-r1.ebuild |
267 |
index b2a4fc2de9c..bc5ad7cee85 100644 |
268 |
--- a/sys-cluster/legion/legion-17.08.0.ebuild |
269 |
+++ b/sys-cluster/legion/legion-19.06.0-r1.ebuild |
270 |
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )" |
271 |
|
272 |
DEPEND=" |
273 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
274 |
- hwloc? ( sys-apps/hwloc ) |
275 |
+ hwloc? ( <sys-apps/hwloc-2:= ) |
276 |
" |
277 |
+RDEPEND="${DEPEND}" |
278 |
|
279 |
src_configure() { |
280 |
mycmakeargs=( |
281 |
|
282 |
diff --git a/sys-cluster/legion/legion-19.06.0.ebuild b/sys-cluster/legion/legion-19.06.0.ebuild |
283 |
deleted file mode 100644 |
284 |
index c9eb5be36ea..00000000000 |
285 |
--- a/sys-cluster/legion/legion-19.06.0.ebuild |
286 |
+++ /dev/null |
287 |
@@ -1,40 +0,0 @@ |
288 |
-# Copyright 1999-2021 Gentoo Authors |
289 |
-# Distributed under the terms of the GNU General Public License v2 |
290 |
- |
291 |
-EAPI=6 |
292 |
- |
293 |
-inherit cmake-utils |
294 |
- |
295 |
-DESCRIPTION="A data-centric parallel programming system" |
296 |
-HOMEPAGE="https://legion.stanford.edu/" |
297 |
-if [[ ${PV} = 9999 ]]; then |
298 |
- inherit git-r3 |
299 |
- EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git" |
300 |
-else |
301 |
- SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz" |
302 |
- KEYWORDS="~amd64" |
303 |
- S="${WORKDIR}/${PN}-${P}" |
304 |
-fi |
305 |
- |
306 |
-LICENSE="BSD" |
307 |
-SLOT="0" |
308 |
-IUSE="gasnet +hwloc test" |
309 |
-RESTRICT="!test? ( test )" |
310 |
- |
311 |
-DEPEND=" |
312 |
- gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
313 |
- hwloc? ( <sys-apps/hwloc-2 ) |
314 |
- " |
315 |
- |
316 |
-src_configure() { |
317 |
- mycmakeargs=( |
318 |
- -DLegion_USE_HWLOC=$(usex hwloc) |
319 |
- -DLegion_USE_GASNet=$(usex gasnet) |
320 |
- -DLegion_ENABLE_TESTING=$(usex test) |
321 |
- -DBUILD_SHARED_LIBS=ON |
322 |
- -DLegion_BUILD_EXAMPLES=ON |
323 |
- -DLegion_BUILD_TESTS=ON |
324 |
- -DLegion_BUILD_TUTORIAL=ON |
325 |
- ) |
326 |
- cmake-utils_src_configure |
327 |
-} |
328 |
|
329 |
diff --git a/sys-cluster/legion/legion-9999.ebuild b/sys-cluster/legion/legion-9999.ebuild |
330 |
index c9eb5be36ea..bc5ad7cee85 100644 |
331 |
--- a/sys-cluster/legion/legion-9999.ebuild |
332 |
+++ b/sys-cluster/legion/legion-9999.ebuild |
333 |
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )" |
334 |
|
335 |
DEPEND=" |
336 |
gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) |
337 |
- hwloc? ( <sys-apps/hwloc-2 ) |
338 |
+ hwloc? ( <sys-apps/hwloc-2:= ) |
339 |
" |
340 |
+RDEPEND="${DEPEND}" |
341 |
|
342 |
src_configure() { |
343 |
mycmakeargs=( |