1 |
commit: ea42befab45a5e6e6dfacf5d6b3cf20f257c80d1 |
2 |
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de> |
3 |
AuthorDate: Sat Sep 26 14:13:56 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 31 09:47:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea42befa |
7 |
|
8 |
sci-libs/libgeodecomp: Drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de> |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
sci-libs/libgeodecomp/Manifest | 1 - |
15 |
.../files/libgeodecomp-0.5.0_pre20200420-mpi.patch | 292 --------------------- |
16 |
.../libgeodecomp-0.5.0_pre20200420.ebuild | 82 ------ |
17 |
3 files changed, 375 deletions(-) |
18 |
|
19 |
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest |
20 |
index 566c35f25be..b0f683b51f4 100644 |
21 |
--- a/sci-libs/libgeodecomp/Manifest |
22 |
+++ b/sci-libs/libgeodecomp/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST libgeodecomp-0.5.0_pre20200420.tar.gz 1507078 BLAKE2B 64d5c9a138c54175ce049a1a02def90553bca617b22c9ac5fa93cd66aebfd7892f5a458f2d3eb3dd987d3c897cbb338b64cb64af7447f6ae74b41d02a762888e SHA512 0e1caa011641fba5af3c32f165fc95ced578ebeb45cb7ef56f1ede416f2e6aef532569a85339e48b43b0050bbfb60ffa1760604577c07137590445a87e691c70 |
25 |
DIST libgeodecomp-0.5.0_pre20201009.tar.gz 1510212 BLAKE2B fdddf8ef8dd93d0a4860dbde27d1e59bda039b27ff7526a1ddfb6cfe8103f54edd2a847dad2ffa1cdc0c4454b2d48e0df7e5f941ad2a9df9c848868817413b03 SHA512 42a28fcce6408c610265f8cde9c9d46e83519a8ec4a3e6b1f0e6637597b4b9a702c43655f9c1cf5a159012533f2c2e937de21bda2aed54cdd6acd19ec5b4030a |
26 |
|
27 |
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch |
28 |
deleted file mode 100644 |
29 |
index 1a1164e342b..00000000000 |
30 |
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch |
31 |
+++ /dev/null |
32 |
@@ -1,292 +0,0 @@ |
33 |
-From 55356ab9c03cd25efeb5176761f2f5b3744b4371 Mon Sep 17 00:00:00 2001 |
34 |
-From: Kurt Kanzenbach <kurt@×××××××××××××.de> |
35 |
-Date: Fri, 24 Jan 2020 17:59:48 +0100 |
36 |
-Subject: [PATCH] cmake: Disable mpiruns |
37 |
- |
38 |
-The mpiruns will violate the sandboxing. Therefore, disable them including |
39 |
-scotch. |
40 |
- |
41 |
-Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de> |
42 |
---- |
43 |
- CMakeLists.txt | 14 +- |
44 |
- CMakeModules/FindSCOTCH.cmake | 238 +++++++++++++++++----------------- |
45 |
- 2 files changed, 121 insertions(+), 131 deletions(-) |
46 |
- |
47 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
48 |
-index ed5cc607c3ed..fec488002958 100644 |
49 |
---- a/CMakeLists.txt |
50 |
-+++ b/CMakeLists.txt |
51 |
-@@ -238,19 +238,9 @@ if (MACHINE_ARCH MATCHES "x86_64") |
52 |
- set(AMD64_LINUX true) |
53 |
- endif() |
54 |
- |
55 |
--# test if mpirun/mpiexec supports the --oversubscribe flag: |
56 |
-+# use the --oversubscribe flag: |
57 |
- if(MPI_FOUND) |
58 |
-- execute_process( |
59 |
-- COMMAND ${MPIEXEC} --oversubscribe ${MPIEXEC_NUMPROC_FLAG} 4 echo ok |
60 |
-- RESULT_VARIABLE MPIEXEC_OVERSUBSCRIBE_RETURN_CODE |
61 |
-- OUTPUT_QUIET |
62 |
-- ERROR_QUIET) |
63 |
-- |
64 |
-- if (MPIEXEC_OVERSUBSCRIBE_RETURN_CODE EQUAL 0) |
65 |
-- set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe") |
66 |
-- else() |
67 |
-- set(MPIEXEC_OVERSUBSCRIBE_FLAG "") |
68 |
-- endif() |
69 |
-+ set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe") |
70 |
- endif() |
71 |
- |
72 |
- #============= 3. CONFIGURABLE BUILD OPTIONS ========================= |
73 |
-diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake |
74 |
-index 5c717977dbba..146c2bf8bb60 100644 |
75 |
---- a/CMakeModules/FindSCOTCH.cmake |
76 |
-+++ b/CMakeModules/FindSCOTCH.cmake |
77 |
-@@ -233,125 +233,125 @@ int main() { |
78 |
- ") |
79 |
- |
80 |
- message(STATUS "Performing test SCOTCH_TEST_RUNS") |
81 |
-- try_run( |
82 |
-- SCOTCH_TEST_LIB_EXITCODE |
83 |
-- SCOTCH_TEST_LIB_COMPILED |
84 |
-- ${CMAKE_CURRENT_BINARY_DIR} |
85 |
-- ${SCOTCH_TEST_LIB_CPP} |
86 |
-- CMAKE_FLAGS |
87 |
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" |
88 |
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" |
89 |
-- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT |
90 |
-- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT |
91 |
-- ) |
92 |
-- |
93 |
-- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) |
94 |
-- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") |
95 |
-- set(SCOTCH_TEST_RUNS TRUE) |
96 |
-- else() |
97 |
-- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") |
98 |
-- if (SCOTCH_DEBUG) |
99 |
-- # Output some variables |
100 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
101 |
-- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") |
102 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
103 |
-- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") |
104 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
105 |
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") |
106 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
107 |
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") |
108 |
-- endif() |
109 |
-- endif() |
110 |
-- |
111 |
-- # If program does not run, try adding zlib library and test again |
112 |
-- if(NOT SCOTCH_TEST_RUNS) |
113 |
-- if (NOT ZLIB_FOUND) |
114 |
-- find_package(ZLIB) |
115 |
-- endif() |
116 |
-- |
117 |
-- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) |
118 |
-- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) |
119 |
-- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) |
120 |
-- |
121 |
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") |
122 |
-- try_run( |
123 |
-- SCOTCH_ZLIB_TEST_LIB_EXITCODE |
124 |
-- SCOTCH_ZLIB_TEST_LIB_COMPILED |
125 |
-- ${CMAKE_CURRENT_BINARY_DIR} |
126 |
-- ${SCOTCH_TEST_LIB_CPP} |
127 |
-- CMAKE_FLAGS |
128 |
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" |
129 |
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" |
130 |
-- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT |
131 |
-- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT |
132 |
-- ) |
133 |
-- |
134 |
-- # Add zlib flags if required and set test run to 'true' |
135 |
-- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) |
136 |
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") |
137 |
-- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) |
138 |
-- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) |
139 |
-- set(SCOTCH_TEST_RUNS TRUE) |
140 |
-- else() |
141 |
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") |
142 |
-- if (SCOTCH_DEBUG) |
143 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
144 |
-- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") |
145 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
146 |
-- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") |
147 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
148 |
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") |
149 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
150 |
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") |
151 |
-- endif() |
152 |
-- endif() |
153 |
-- |
154 |
-- endif() |
155 |
-- endif() |
156 |
-- |
157 |
-- if(NOT SCOTCH_TEST_RUNS) |
158 |
-- if (NOT BZIP2_FOUND) |
159 |
-- find_package(BZip2) |
160 |
-- endif() |
161 |
-- |
162 |
-- if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) |
163 |
-- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR}) |
164 |
-- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES}) |
165 |
-- |
166 |
-- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS") |
167 |
-- try_run( |
168 |
-- SCOTCH_BZIP2_TEST_LIB_EXITCODE |
169 |
-- SCOTCH_BZIP2_TEST_LIB_COMPILED |
170 |
-- ${CMAKE_CURRENT_BINARY_DIR} |
171 |
-- ${SCOTCH_TEST_LIB_CPP} |
172 |
-- CMAKE_FLAGS |
173 |
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" |
174 |
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" |
175 |
-- COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT |
176 |
-- RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT |
177 |
-- ) |
178 |
-- |
179 |
-- # Add zlib flags if required and set test run to 'true' |
180 |
-- if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0) |
181 |
-- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success") |
182 |
-- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR}) |
183 |
-- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES}) |
184 |
-- set(SCOTCH_TEST_RUNS TRUE) |
185 |
-- else() |
186 |
-- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed") |
187 |
-- if (SCOTCH_DEBUG) |
188 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
189 |
-- "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}") |
190 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
191 |
-- "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}") |
192 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
193 |
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") |
194 |
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
195 |
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") |
196 |
-- endif() |
197 |
-- endif() |
198 |
-- endif() |
199 |
-- endif() |
200 |
-+ # try_run( |
201 |
-+ # SCOTCH_TEST_LIB_EXITCODE |
202 |
-+ # SCOTCH_TEST_LIB_COMPILED |
203 |
-+ # ${CMAKE_CURRENT_BINARY_DIR} |
204 |
-+ # ${SCOTCH_TEST_LIB_CPP} |
205 |
-+ # CMAKE_FLAGS |
206 |
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" |
207 |
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" |
208 |
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT |
209 |
-+ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT |
210 |
-+ # ) |
211 |
-+ |
212 |
-+ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) |
213 |
-+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") |
214 |
-+ # set(SCOTCH_TEST_RUNS TRUE) |
215 |
-+ # else() |
216 |
-+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") |
217 |
-+ # if (SCOTCH_DEBUG) |
218 |
-+ # # Output some variables |
219 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
220 |
-+ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") |
221 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
222 |
-+ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") |
223 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
224 |
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") |
225 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
226 |
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") |
227 |
-+ # endif() |
228 |
-+ # endif() |
229 |
-+ |
230 |
-+ # # If program does not run, try adding zlib library and test again |
231 |
-+ # if(NOT SCOTCH_TEST_RUNS) |
232 |
-+ # if (NOT ZLIB_FOUND) |
233 |
-+ # find_package(ZLIB) |
234 |
-+ # endif() |
235 |
-+ |
236 |
-+ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) |
237 |
-+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) |
238 |
-+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) |
239 |
-+ |
240 |
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") |
241 |
-+ # try_run( |
242 |
-+ # SCOTCH_ZLIB_TEST_LIB_EXITCODE |
243 |
-+ # SCOTCH_ZLIB_TEST_LIB_COMPILED |
244 |
-+ # ${CMAKE_CURRENT_BINARY_DIR} |
245 |
-+ # ${SCOTCH_TEST_LIB_CPP} |
246 |
-+ # CMAKE_FLAGS |
247 |
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" |
248 |
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" |
249 |
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT |
250 |
-+ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT |
251 |
-+ # ) |
252 |
-+ |
253 |
-+ # # Add zlib flags if required and set test run to 'true' |
254 |
-+ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) |
255 |
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") |
256 |
-+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) |
257 |
-+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) |
258 |
-+ # set(SCOTCH_TEST_RUNS TRUE) |
259 |
-+ # else() |
260 |
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") |
261 |
-+ # if (SCOTCH_DEBUG) |
262 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
263 |
-+ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") |
264 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
265 |
-+ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") |
266 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
267 |
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") |
268 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
269 |
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") |
270 |
-+ # endif() |
271 |
-+ # endif() |
272 |
-+ |
273 |
-+ # endif() |
274 |
-+ # endif() |
275 |
-+ |
276 |
-+ # if(NOT SCOTCH_TEST_RUNS) |
277 |
-+ # if (NOT BZIP2_FOUND) |
278 |
-+ # find_package(BZip2) |
279 |
-+ # endif() |
280 |
-+ |
281 |
-+ # if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) |
282 |
-+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR}) |
283 |
-+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES}) |
284 |
-+ |
285 |
-+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS") |
286 |
-+ # try_run( |
287 |
-+ # SCOTCH_BZIP2_TEST_LIB_EXITCODE |
288 |
-+ # SCOTCH_BZIP2_TEST_LIB_COMPILED |
289 |
-+ # ${CMAKE_CURRENT_BINARY_DIR} |
290 |
-+ # ${SCOTCH_TEST_LIB_CPP} |
291 |
-+ # CMAKE_FLAGS |
292 |
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" |
293 |
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" |
294 |
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT |
295 |
-+ # RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT |
296 |
-+ # ) |
297 |
-+ |
298 |
-+ # # Add zlib flags if required and set test run to 'true' |
299 |
-+ # if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0) |
300 |
-+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success") |
301 |
-+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR}) |
302 |
-+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES}) |
303 |
-+ # set(SCOTCH_TEST_RUNS TRUE) |
304 |
-+ # else() |
305 |
-+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed") |
306 |
-+ # if (SCOTCH_DEBUG) |
307 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
308 |
-+ # "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}") |
309 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
310 |
-+ # "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}") |
311 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
312 |
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") |
313 |
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |
314 |
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") |
315 |
-+ # endif() |
316 |
-+ # endif() |
317 |
-+ # endif() |
318 |
-+ # endif() |
319 |
- |
320 |
- endif() |
321 |
- endif() |
322 |
--- |
323 |
-2.24.1 |
324 |
- |
325 |
|
326 |
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild |
327 |
deleted file mode 100644 |
328 |
index d269428d5cd..00000000000 |
329 |
--- a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild |
330 |
+++ /dev/null |
331 |
@@ -1,82 +0,0 @@ |
332 |
-# Copyright 1999-2020 Gentoo Authors |
333 |
-# Distributed under the terms of the GNU General Public License v2 |
334 |
- |
335 |
-EAPI=7 |
336 |
- |
337 |
-inherit cmake cuda virtualx |
338 |
- |
339 |
-MY_COMMIT="69c5573ac7b2b654d649e8902fad73b05bf33644" |
340 |
- |
341 |
-DESCRIPTION="An auto-parallelizing library to speed up computer simulations" |
342 |
-HOMEPAGE=" |
343 |
- http://www.libgeodecomp.org |
344 |
- https://github.com/STEllAR-GROUP/libgeodecomp" |
345 |
-SRC_URI="https://github.com/STEllAR-GROUP/libgeodecomp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" |
346 |
- |
347 |
-SLOT="0" |
348 |
-LICENSE="Boost-1.0" |
349 |
-KEYWORDS="~amd64 ~ppc ~x86" |
350 |
-IUSE="cuda doc hpx mpi opencl opencv qt5 silo" |
351 |
- |
352 |
-BDEPEND=" |
353 |
- doc? ( |
354 |
- app-doc/doxygen |
355 |
- app-text/texlive |
356 |
- media-gfx/graphviz |
357 |
- )" |
358 |
-RDEPEND="dev-libs/boost" |
359 |
-DEPEND="${RDEPEND} |
360 |
- ~dev-libs/libflatarray-0.4.0_pre20200314 |
361 |
- cuda? ( dev-util/nvidia-cuda-toolkit ) |
362 |
- hpx? ( sys-cluster/hpx ) |
363 |
- mpi? ( virtual/mpi ) |
364 |
- opencl? ( virtual/opencl ) |
365 |
- opencv? ( media-libs/opencv ) |
366 |
- qt5? ( |
367 |
- dev-qt/qtcore:5 |
368 |
- dev-qt/qtgui:5 |
369 |
- dev-qt/qtopengl:5 |
370 |
- dev-qt/qtwidgets:5 |
371 |
- ) |
372 |
- silo? ( sci-libs/silo )" |
373 |
- |
374 |
-S="${WORKDIR}/libgeodecomp-${MY_COMMIT}" |
375 |
- |
376 |
-PATCHES=( "${FILESDIR}/${P}-mpi.patch" ) |
377 |
- |
378 |
-DOCS=( README ) |
379 |
- |
380 |
-src_prepare() { |
381 |
- cmake_src_prepare |
382 |
- use cuda && cuda_src_prepare |
383 |
-} |
384 |
- |
385 |
-src_configure() { |
386 |
- local mycmakeargs=( |
387 |
- -DWITH_CUDA=$(usex cuda) |
388 |
- -DWITH_HPX=$(usex hpx) |
389 |
- -DWITH_MPI=$(usex mpi) |
390 |
- -DWITH_OPENCL=$(usex opencl) |
391 |
- -DWITH_OPENCV=$(usex opencv) |
392 |
- -DWITH_QT5=$(usex qt5) |
393 |
- -DWITH_SCOTCH=false |
394 |
- -DWITH_SILO=$(usex silo) |
395 |
- -DWITH_TYPEMAPS=false |
396 |
- -DWITH_VISIT=false |
397 |
- ) |
398 |
- cmake_src_configure |
399 |
-} |
400 |
- |
401 |
-src_compile() { |
402 |
- cmake_src_compile |
403 |
- use doc && cmake_build doc |
404 |
-} |
405 |
- |
406 |
-src_install() { |
407 |
- use doc && local HTML_DOCS=( doc/html/* ) |
408 |
- cmake_src_install |
409 |
-} |
410 |
- |
411 |
-src_test() { |
412 |
- virtx cmake_build check |
413 |
-} |