From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- sci-libs/libgeodecomp/Manifest | 9 +- .../files/libgeodecomp-0.5.0_pre20200314-hpx.patch | 246 ----------------- .../libgeodecomp-0.5.0_pre20200314-libdir.patch | 32 --- .../files/libgeodecomp-0.5.0_pre20200314-mpi.patch | 292 --------------------- .../libgeodecomp-0.5.0_pre20200314-warnings.patch | 33 --- .../files/libgeodecomp-0.5.0_pre20200420-mpi.patch | 292 +++++++++++++++++++++ .../libgeodecomp-0.5.0_pre20200314.ebuild | 86 ------ .../libgeodecomp-0.5.0_pre20200420.ebuild | 82 ++++++ 8 files changed, 377 insertions(+), 695 deletions(-) delete mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch delete mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch delete mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch delete mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch create mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch delete mode 100644 sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild create mode 100644 sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild (limited to 'sci-libs/libgeodecomp') diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest index b13b3f8edbe9..7e3f04987287 100644 --- a/sci-libs/libgeodecomp/Manifest +++ b/sci-libs/libgeodecomp/Manifest @@ -1,7 +1,4 @@ -AUX libgeodecomp-0.5.0_pre20200314-hpx.patch 9844 BLAKE2B 4f2fb08bdac5396bcc0fa6af26db15ee819bdeb541eb639d5de88158b57ac2acbba2bf021ce569bbfd60e42da481095cb9826912da67f53d01250f4d05f32395 SHA512 66fc7262a4f6a4cb84d5488bcf50e67fe0f62b4a24301bd7b4143b949f22ca1d5cd5dfb93be0e27221c2201d268eafda5099765ca812413b314d88b2b7c64fa6 -AUX libgeodecomp-0.5.0_pre20200314-libdir.patch 1070 BLAKE2B 6cd368ad278e879a07ea655207ef19010dbceadeccb3434689c98054a9157893c916e76ca4a16a2f7b343a395b2ecc05754e0bdf114b37f61eb598cf84d34cb4 SHA512 db9cd6a601771727ba66b629f6b15f03bfe8440e91df307f8c44e3706e6b07273b8cbbd88696c5f14261993a2e9a6c12d9931ef7293e68e7961ca0bc774afe48 -AUX libgeodecomp-0.5.0_pre20200314-mpi.patch 13752 BLAKE2B ed5e2cafc0c8777e30ecf7e3b896aab1226b110c948e984dabf15d0bb85fa931f6991e1c108e55bab4016131c6f142d589500004e4ac76cb840c41eb975f41ea SHA512 b33ddbe1e0293e14b9f6b2a982cf8717d5c6dbceb34c476a5896c2eb3776ecbac9e219f11b9aea6a10a108b1fae3a2b373976e7636ff80b0f381b6bd4e1b0722 -AUX libgeodecomp-0.5.0_pre20200314-warnings.patch 1111 BLAKE2B 2a06ca14fa8d12b1c1d6f56bedb5937c8e7aed00fa6c5f7bed42978c94164f17c00a1b71542b12348013c0ae9d30545c9ccebeac81e42af3c7ae9b583554bd21 SHA512 6c152fb43ae26f69dc0963f51a99e41d39ed2056cd88fd6771e516b64cdd77ae918d9726c9a1be72154c8a434b266bdba749c54cc13dfb768a8b9044c18ddc75 -DIST libgeodecomp-0.5.0_pre20200314.tar.gz 1506929 BLAKE2B 078a0d3384963b0d3b5e5885d794b4feb6493ab3c4d4df068c300769f6bd8ee1d695accec0f4a702b218d725cc68889450d7d4fbddd495387e75a6804bbd8de9 SHA512 5bc23ce68d91d3cb8ec753a09efc4d7c46aab3c307c529f2f2e09593d14bcb027532aeea32ba99ce524cc6dfb248e983a040f482a47784f5da6fb07aac06a859 -EBUILD libgeodecomp-0.5.0_pre20200314.ebuild 1767 BLAKE2B fafc8b73b2efe3269df78d720a5a5be895081859f768b609c0b683f4f62c1434eb1cc4e72c1060a6da6f2edeb8b4a1591461789152f44a851cba6f8244dcbb5f SHA512 bf7c98a48962e5e30d3713d850b0631133c4ab31110fb5f7d8f0fc4861838c4fe042c1993624a3863fbfb12dfab927178e29de1906bc9e0fa5284efc2635c844 +AUX libgeodecomp-0.5.0_pre20200420-mpi.patch 13752 BLAKE2B ed5e2cafc0c8777e30ecf7e3b896aab1226b110c948e984dabf15d0bb85fa931f6991e1c108e55bab4016131c6f142d589500004e4ac76cb840c41eb975f41ea SHA512 b33ddbe1e0293e14b9f6b2a982cf8717d5c6dbceb34c476a5896c2eb3776ecbac9e219f11b9aea6a10a108b1fae3a2b373976e7636ff80b0f381b6bd4e1b0722 +DIST libgeodecomp-0.5.0_pre20200420.tar.gz 1507078 BLAKE2B 64d5c9a138c54175ce049a1a02def90553bca617b22c9ac5fa93cd66aebfd7892f5a458f2d3eb3dd987d3c897cbb338b64cb64af7447f6ae74b41d02a762888e SHA512 0e1caa011641fba5af3c32f165fc95ced578ebeb45cb7ef56f1ede416f2e6aef532569a85339e48b43b0050bbfb60ffa1760604577c07137590445a87e691c70 +EBUILD libgeodecomp-0.5.0_pre20200420.ebuild 1673 BLAKE2B c83553fc11313cad76f3b726cbdfc0326a5c545665d448553302b8309a228ad483c0a924d84322fff514f27e0097e3df3e9ca4f56ba7a371487d647b5bbf6099 SHA512 9046846474befbd1aaa2d8351295d222fed3e1901912e9b683c0236a38f2fcb894b35154d1dec86499b3083baa2d04351261cde288eafe55ed0ca4eb3d51adb7 MISC metadata.xml 1345 BLAKE2B d6cb11021ade1a8c9007bf7a57c1e9355e19331498b66f746405bbd52dd5562656e827ab1db290190c37b283f579512609cf730d0ea27f6c31629d7e1fc38266 SHA512 f377ab4249dc9bb3dc2518e7d86ad6c2b44cd1249474480a5a71aa5b944c220ddc1608a8171d1abeaffa3d4628f4f327956cfb412ac14336f75705b7d8fe0fd9 diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch deleted file mode 100644 index 9f71ea087c69..000000000000 --- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch +++ /dev/null @@ -1,246 +0,0 @@ -From fe581cc24805288c6c1a9b26a4b72748906f16c8 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Thu, 26 Mar 2020 15:58:46 +0100 -Subject: [PATCH] hpx: Remove use of deprecated header - -The current hpx version is v1.4. Remove the usage of deprecated hpx headers and -make it compile again. - -Signed-off-by: Kurt Kanzenbach ---- - src/libgeodecomp/communication/hpxreceiver.h | 5 ++--- - src/libgeodecomp/communication/hpxserializationwrapper.h | 8 ++++---- - .../communication/test/parallel_hpx_4/hpxreceivertest.h | 5 ++--- - src/libgeodecomp/geometry/coord.h | 4 ++-- - src/libgeodecomp/io/mocksteerer.h | 5 +++++ - src/libgeodecomp/io/mockwriter.h | 5 +++++ - src/libgeodecomp/misc/clonable.h | 2 +- - src/libgeodecomp/misc/nonpodtestcell.h | 2 +- - src/libgeodecomp/parallelization/hpxsimulator.cpp | 2 +- - src/libgeodecomp/parallelization/hpxsimulator.h | 9 ++++----- - src/libgeodecomp/storage/displacedgrid.h | 4 ++-- - src/libgeodecomp/storage/grid.h | 4 ++-- - src/libgeodecomp/storage/patchprovider.h | 3 ++- - .../storage/test/unit/reorderingunstructuredgridtest.h | 4 ++-- - 14 files changed, 35 insertions(+), 27 deletions(-) - -diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h -index 1a0baf9bbdee..beb657b88bbc 100644 ---- a/src/libgeodecomp/communication/hpxreceiver.h -+++ b/src/libgeodecomp/communication/hpxreceiver.h -@@ -10,10 +10,9 @@ - - #include - #include --#include --#include -+#include -+#include - #include --#include - #include - #include - -diff --git a/src/libgeodecomp/communication/hpxserializationwrapper.h b/src/libgeodecomp/communication/hpxserializationwrapper.h -index 5ebf06c4cf7c..0afb145840a6 100644 ---- a/src/libgeodecomp/communication/hpxserializationwrapper.h -+++ b/src/libgeodecomp/communication/hpxserializationwrapper.h -@@ -10,10 +10,10 @@ - * just pull in this header. - */ - #include --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - #endif - -diff --git a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h -index ab16a0947546..b2f9c6d47559 100644 ---- a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h -+++ b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h -@@ -1,9 +1,8 @@ - #include - #include --#include -+#include - #include --#include --#include -+#include - #include - #include - -diff --git a/src/libgeodecomp/geometry/coord.h b/src/libgeodecomp/geometry/coord.h -index 5df21310d3ee..8772980c52df 100644 ---- a/src/libgeodecomp/geometry/coord.h -+++ b/src/libgeodecomp/geometry/coord.h -@@ -10,8 +10,8 @@ - #ifdef LIBGEODECOMP_WITH_HPX - #include - #include --#include --#include -+#include -+#include - #endif - - // For Intel MPI we need to source mpi.h before stdio.h: -diff --git a/src/libgeodecomp/io/mocksteerer.h b/src/libgeodecomp/io/mocksteerer.h -index 4ab2d28c5097..e20d0d5bb6bf 100644 ---- a/src/libgeodecomp/io/mocksteerer.h -+++ b/src/libgeodecomp/io/mocksteerer.h -@@ -4,6 +4,11 @@ - #include - #include - -+#ifdef LIBGEODECOMP_WITH_HPX -+#include -+#include -+#endif -+ - namespace LibGeoDecomp { - - namespace MockSteererHelpers { -diff --git a/src/libgeodecomp/io/mockwriter.h b/src/libgeodecomp/io/mockwriter.h -index 4d6d13c93acb..36cb7e1e1ae6 100644 ---- a/src/libgeodecomp/io/mockwriter.h -+++ b/src/libgeodecomp/io/mockwriter.h -@@ -8,6 +8,11 @@ - #include - #include - -+#ifdef LIBGEODECOMP_WITH_HPX -+#include -+#include -+#endif -+ - #include - - namespace LibGeoDecomp { -diff --git a/src/libgeodecomp/misc/clonable.h b/src/libgeodecomp/misc/clonable.h -index 8162513826b8..a1dccbf94bd3 100644 ---- a/src/libgeodecomp/misc/clonable.h -+++ b/src/libgeodecomp/misc/clonable.h -@@ -5,7 +5,7 @@ - - #ifdef LIBGEODECOMP_WITH_HPX - #include --#include -+#include - #endif - - namespace LibGeoDecomp { -diff --git a/src/libgeodecomp/misc/nonpodtestcell.h b/src/libgeodecomp/misc/nonpodtestcell.h -index 66453ce80ba7..1618c8359b90 100644 ---- a/src/libgeodecomp/misc/nonpodtestcell.h -+++ b/src/libgeodecomp/misc/nonpodtestcell.h -@@ -11,7 +11,7 @@ - #endif - - #ifdef LIBGEODECOMP_WITH_HPX --#include -+#include - #endif - - namespace LibGeoDecomp { -diff --git a/src/libgeodecomp/parallelization/hpxsimulator.cpp b/src/libgeodecomp/parallelization/hpxsimulator.cpp -index 6e2fb6c78519..0329d6815913 100644 ---- a/src/libgeodecomp/parallelization/hpxsimulator.cpp -+++ b/src/libgeodecomp/parallelization/hpxsimulator.cpp -@@ -3,7 +3,7 @@ - - #include - #include --#include -+#include - - namespace LibGeoDecomp { - namespace HpxSimulatorHelpers { -diff --git a/src/libgeodecomp/parallelization/hpxsimulator.h b/src/libgeodecomp/parallelization/hpxsimulator.h -index 1ccdf883e915..15b5a3628f9d 100644 ---- a/src/libgeodecomp/parallelization/hpxsimulator.h -+++ b/src/libgeodecomp/parallelization/hpxsimulator.h -@@ -6,11 +6,10 @@ - - #include - #include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - #include - #include -diff --git a/src/libgeodecomp/storage/displacedgrid.h b/src/libgeodecomp/storage/displacedgrid.h -index 5c72e520ce48..a8831053fedc 100644 ---- a/src/libgeodecomp/storage/displacedgrid.h -+++ b/src/libgeodecomp/storage/displacedgrid.h -@@ -19,8 +19,8 @@ - #ifdef LIBGEODECOMP_WITH_HPX - #include - #include --#include --#include -+#include -+#include - #endif - - namespace LibGeoDecomp { -diff --git a/src/libgeodecomp/storage/grid.h b/src/libgeodecomp/storage/grid.h -index 6e218696f625..821b02002c87 100644 ---- a/src/libgeodecomp/storage/grid.h -+++ b/src/libgeodecomp/storage/grid.h -@@ -26,8 +26,8 @@ - #ifdef LIBGEODECOMP_WITH_HPX - #include - #include --#include --#include -+#include -+#include - #endif - - namespace LibGeoDecomp { -diff --git a/src/libgeodecomp/storage/patchprovider.h b/src/libgeodecomp/storage/patchprovider.h -index 71fda8091e95..66aa67f214fa 100644 ---- a/src/libgeodecomp/storage/patchprovider.h -+++ b/src/libgeodecomp/storage/patchprovider.h -@@ -2,7 +2,8 @@ - #define LIBGEODECOMP_STORAGE_PATCHPROVIDER_H - - #ifdef LIBGEODECOMP_WITH_HPX --#include -+#include -+#include - #include - #endif - -diff --git a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h -index d89146a4bf69..7cb5203dae44 100644 ---- a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h -+++ b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h -@@ -19,8 +19,8 @@ - #ifdef LIBGEODECOMP_WITH_HPX - #include - #include --#include --#include -+#include -+#include - #endif - - using namespace LibGeoDecomp; --- -2.24.1 - diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch deleted file mode 100644 index d76930d83ca1..000000000000 --- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b03cef449361bef6d65f40382227714e0e0980c3 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Fri, 21 Feb 2020 19:47:51 +0100 -Subject: [PATCH] cmake: Fix library installation directory - -Signed-off-by: Kurt Kanzenbach ---- - src/CMakeLists.txt | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b82d667087ba..f4ea6b379ec7 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -335,11 +335,12 @@ endif() - target_link_libraries(geodecomp ${LIBGEODECOMP_LINK_LIBRARIES}) - - #============= 6. INSTALLER CONFIG =================================== -+include(GNUInstallDirs) - install( - TARGETS geodecomp - EXPORT ${PACKAGE_NAME}-targets -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - install(FILES "${CMAKE_BINARY_DIR}/${PACKAGE_NAME}/config.h" DESTINATION include/${PACKAGE_NAME}) - install(FILES libgeodecomp.h DESTINATION include) --- -2.24.1 - diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch deleted file mode 100644 index 1a1164e342be..000000000000 --- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch +++ /dev/null @@ -1,292 +0,0 @@ -From 55356ab9c03cd25efeb5176761f2f5b3744b4371 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Fri, 24 Jan 2020 17:59:48 +0100 -Subject: [PATCH] cmake: Disable mpiruns - -The mpiruns will violate the sandboxing. Therefore, disable them including -scotch. - -Signed-off-by: Kurt Kanzenbach ---- - CMakeLists.txt | 14 +- - CMakeModules/FindSCOTCH.cmake | 238 +++++++++++++++++----------------- - 2 files changed, 121 insertions(+), 131 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed5cc607c3ed..fec488002958 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -238,19 +238,9 @@ if (MACHINE_ARCH MATCHES "x86_64") - set(AMD64_LINUX true) - endif() - --# test if mpirun/mpiexec supports the --oversubscribe flag: -+# use the --oversubscribe flag: - if(MPI_FOUND) -- execute_process( -- COMMAND ${MPIEXEC} --oversubscribe ${MPIEXEC_NUMPROC_FLAG} 4 echo ok -- RESULT_VARIABLE MPIEXEC_OVERSUBSCRIBE_RETURN_CODE -- OUTPUT_QUIET -- ERROR_QUIET) -- -- if (MPIEXEC_OVERSUBSCRIBE_RETURN_CODE EQUAL 0) -- set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe") -- else() -- set(MPIEXEC_OVERSUBSCRIBE_FLAG "") -- endif() -+ set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe") - endif() - - #============= 3. CONFIGURABLE BUILD OPTIONS ========================= -diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake -index 5c717977dbba..146c2bf8bb60 100644 ---- a/CMakeModules/FindSCOTCH.cmake -+++ b/CMakeModules/FindSCOTCH.cmake -@@ -233,125 +233,125 @@ int main() { - ") - - message(STATUS "Performing test SCOTCH_TEST_RUNS") -- try_run( -- SCOTCH_TEST_LIB_EXITCODE -- SCOTCH_TEST_LIB_COMPILED -- ${CMAKE_CURRENT_BINARY_DIR} -- ${SCOTCH_TEST_LIB_CPP} -- CMAKE_FLAGS -- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT -- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT -- ) -- -- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) -- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") -- set(SCOTCH_TEST_RUNS TRUE) -- else() -- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") -- if (SCOTCH_DEBUG) -- # Output some variables -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -- endif() -- endif() -- -- # If program does not run, try adding zlib library and test again -- if(NOT SCOTCH_TEST_RUNS) -- if (NOT ZLIB_FOUND) -- find_package(ZLIB) -- endif() -- -- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) -- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) -- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) -- -- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") -- try_run( -- SCOTCH_ZLIB_TEST_LIB_EXITCODE -- SCOTCH_ZLIB_TEST_LIB_COMPILED -- ${CMAKE_CURRENT_BINARY_DIR} -- ${SCOTCH_TEST_LIB_CPP} -- CMAKE_FLAGS -- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT -- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT -- ) -- -- # Add zlib flags if required and set test run to 'true' -- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) -- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") -- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) -- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) -- set(SCOTCH_TEST_RUNS TRUE) -- else() -- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") -- if (SCOTCH_DEBUG) -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -- endif() -- endif() -- -- endif() -- endif() -- -- if(NOT SCOTCH_TEST_RUNS) -- if (NOT BZIP2_FOUND) -- find_package(BZip2) -- endif() -- -- if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) -- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR}) -- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES}) -- -- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS") -- try_run( -- SCOTCH_BZIP2_TEST_LIB_EXITCODE -- SCOTCH_BZIP2_TEST_LIB_COMPILED -- ${CMAKE_CURRENT_BINARY_DIR} -- ${SCOTCH_TEST_LIB_CPP} -- CMAKE_FLAGS -- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -- COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT -- RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT -- ) -- -- # Add zlib flags if required and set test run to 'true' -- if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0) -- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success") -- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR}) -- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES}) -- set(SCOTCH_TEST_RUNS TRUE) -- else() -- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed") -- if (SCOTCH_DEBUG) -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -- endif() -- endif() -- endif() -- endif() -+ # try_run( -+ # SCOTCH_TEST_LIB_EXITCODE -+ # SCOTCH_TEST_LIB_COMPILED -+ # ${CMAKE_CURRENT_BINARY_DIR} -+ # ${SCOTCH_TEST_LIB_CPP} -+ # CMAKE_FLAGS -+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -+ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT -+ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT -+ # ) -+ -+ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) -+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") -+ # set(SCOTCH_TEST_RUNS TRUE) -+ # else() -+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") -+ # if (SCOTCH_DEBUG) -+ # # Output some variables -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -+ # endif() -+ # endif() -+ -+ # # If program does not run, try adding zlib library and test again -+ # if(NOT SCOTCH_TEST_RUNS) -+ # if (NOT ZLIB_FOUND) -+ # find_package(ZLIB) -+ # endif() -+ -+ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) -+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) -+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) -+ -+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") -+ # try_run( -+ # SCOTCH_ZLIB_TEST_LIB_EXITCODE -+ # SCOTCH_ZLIB_TEST_LIB_COMPILED -+ # ${CMAKE_CURRENT_BINARY_DIR} -+ # ${SCOTCH_TEST_LIB_CPP} -+ # CMAKE_FLAGS -+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -+ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT -+ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT -+ # ) -+ -+ # # Add zlib flags if required and set test run to 'true' -+ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) -+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") -+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) -+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) -+ # set(SCOTCH_TEST_RUNS TRUE) -+ # else() -+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") -+ # if (SCOTCH_DEBUG) -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -+ # endif() -+ # endif() -+ -+ # endif() -+ # endif() -+ -+ # if(NOT SCOTCH_TEST_RUNS) -+ # if (NOT BZIP2_FOUND) -+ # find_package(BZip2) -+ # endif() -+ -+ # if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) -+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR}) -+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES}) -+ -+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS") -+ # try_run( -+ # SCOTCH_BZIP2_TEST_LIB_EXITCODE -+ # SCOTCH_BZIP2_TEST_LIB_COMPILED -+ # ${CMAKE_CURRENT_BINARY_DIR} -+ # ${SCOTCH_TEST_LIB_CPP} -+ # CMAKE_FLAGS -+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -+ # COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT -+ # RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT -+ # ) -+ -+ # # Add zlib flags if required and set test run to 'true' -+ # if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0) -+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success") -+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR}) -+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES}) -+ # set(SCOTCH_TEST_RUNS TRUE) -+ # else() -+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed") -+ # if (SCOTCH_DEBUG) -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -+ # endif() -+ # endif() -+ # endif() -+ # endif() - - endif() - endif() --- -2.24.1 - diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch deleted file mode 100644 index 2a7acd0c655b..000000000000 --- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 87e1918e13fa3f3124e945a0ea12cfb339ddf303 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Thu, 26 Mar 2020 16:05:02 +0100 -Subject: [PATCH] hpx: receiver: Remove std::move() call - -This fixes the following warning: - -|/home/kurt/git/libgeodecomp/src/libgeodecomp/communication/hpxreceiver.h:138:29: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move] -| 138 | return std::move(vec); - -The compiler should be smart enough to optimize the correct way :). - -Signed-off-by: Kurt Kanzenbach ---- - src/libgeodecomp/communication/hpxreceiver.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h -index beb657b88bbc..28de314d5ef5 100644 ---- a/src/libgeodecomp/communication/hpxreceiver.h -+++ b/src/libgeodecomp/communication/hpxreceiver.h -@@ -135,7 +135,7 @@ public: - vec << receiver->get(i).get(); - } - -- return std::move(vec); -+ return vec; - } - - private: --- -2.24.1 - 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 new file mode 100644 index 000000000000..1a1164e342be --- /dev/null +++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch @@ -0,0 +1,292 @@ +From 55356ab9c03cd25efeb5176761f2f5b3744b4371 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Fri, 24 Jan 2020 17:59:48 +0100 +Subject: [PATCH] cmake: Disable mpiruns + +The mpiruns will violate the sandboxing. Therefore, disable them including +scotch. + +Signed-off-by: Kurt Kanzenbach +--- + CMakeLists.txt | 14 +- + CMakeModules/FindSCOTCH.cmake | 238 +++++++++++++++++----------------- + 2 files changed, 121 insertions(+), 131 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed5cc607c3ed..fec488002958 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -238,19 +238,9 @@ if (MACHINE_ARCH MATCHES "x86_64") + set(AMD64_LINUX true) + endif() + +-# test if mpirun/mpiexec supports the --oversubscribe flag: ++# use the --oversubscribe flag: + if(MPI_FOUND) +- execute_process( +- COMMAND ${MPIEXEC} --oversubscribe ${MPIEXEC_NUMPROC_FLAG} 4 echo ok +- RESULT_VARIABLE MPIEXEC_OVERSUBSCRIBE_RETURN_CODE +- OUTPUT_QUIET +- ERROR_QUIET) +- +- if (MPIEXEC_OVERSUBSCRIBE_RETURN_CODE EQUAL 0) +- set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe") +- else() +- set(MPIEXEC_OVERSUBSCRIBE_FLAG "") +- endif() ++ set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe") + endif() + + #============= 3. CONFIGURABLE BUILD OPTIONS ========================= +diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake +index 5c717977dbba..146c2bf8bb60 100644 +--- a/CMakeModules/FindSCOTCH.cmake ++++ b/CMakeModules/FindSCOTCH.cmake +@@ -233,125 +233,125 @@ int main() { + ") + + message(STATUS "Performing test SCOTCH_TEST_RUNS") +- try_run( +- SCOTCH_TEST_LIB_EXITCODE +- SCOTCH_TEST_LIB_COMPILED +- ${CMAKE_CURRENT_BINARY_DIR} +- ${SCOTCH_TEST_LIB_CPP} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" +- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" +- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT +- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT +- ) +- +- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) +- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") +- set(SCOTCH_TEST_RUNS TRUE) +- else() +- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") +- if (SCOTCH_DEBUG) +- # Output some variables +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") +- endif() +- endif() +- +- # If program does not run, try adding zlib library and test again +- if(NOT SCOTCH_TEST_RUNS) +- if (NOT ZLIB_FOUND) +- find_package(ZLIB) +- endif() +- +- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) +- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) +- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) +- +- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") +- try_run( +- SCOTCH_ZLIB_TEST_LIB_EXITCODE +- SCOTCH_ZLIB_TEST_LIB_COMPILED +- ${CMAKE_CURRENT_BINARY_DIR} +- ${SCOTCH_TEST_LIB_CPP} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" +- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" +- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT +- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT +- ) +- +- # Add zlib flags if required and set test run to 'true' +- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) +- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") +- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) +- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) +- set(SCOTCH_TEST_RUNS TRUE) +- else() +- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") +- if (SCOTCH_DEBUG) +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") +- endif() +- endif() +- +- endif() +- endif() +- +- if(NOT SCOTCH_TEST_RUNS) +- if (NOT BZIP2_FOUND) +- find_package(BZip2) +- endif() +- +- if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) +- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR}) +- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES}) +- +- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS") +- try_run( +- SCOTCH_BZIP2_TEST_LIB_EXITCODE +- SCOTCH_BZIP2_TEST_LIB_COMPILED +- ${CMAKE_CURRENT_BINARY_DIR} +- ${SCOTCH_TEST_LIB_CPP} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" +- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" +- COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT +- RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT +- ) +- +- # Add zlib flags if required and set test run to 'true' +- if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0) +- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success") +- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR}) +- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES}) +- set(SCOTCH_TEST_RUNS TRUE) +- else() +- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed") +- if (SCOTCH_DEBUG) +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") +- endif() +- endif() +- endif() +- endif() ++ # try_run( ++ # SCOTCH_TEST_LIB_EXITCODE ++ # SCOTCH_TEST_LIB_COMPILED ++ # ${CMAKE_CURRENT_BINARY_DIR} ++ # ${SCOTCH_TEST_LIB_CPP} ++ # CMAKE_FLAGS ++ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" ++ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" ++ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT ++ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT ++ # ) ++ ++ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) ++ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") ++ # set(SCOTCH_TEST_RUNS TRUE) ++ # else() ++ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") ++ # if (SCOTCH_DEBUG) ++ # # Output some variables ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") ++ # endif() ++ # endif() ++ ++ # # If program does not run, try adding zlib library and test again ++ # if(NOT SCOTCH_TEST_RUNS) ++ # if (NOT ZLIB_FOUND) ++ # find_package(ZLIB) ++ # endif() ++ ++ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) ++ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) ++ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) ++ ++ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") ++ # try_run( ++ # SCOTCH_ZLIB_TEST_LIB_EXITCODE ++ # SCOTCH_ZLIB_TEST_LIB_COMPILED ++ # ${CMAKE_CURRENT_BINARY_DIR} ++ # ${SCOTCH_TEST_LIB_CPP} ++ # CMAKE_FLAGS ++ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" ++ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" ++ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT ++ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT ++ # ) ++ ++ # # Add zlib flags if required and set test run to 'true' ++ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) ++ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") ++ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) ++ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) ++ # set(SCOTCH_TEST_RUNS TRUE) ++ # else() ++ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") ++ # if (SCOTCH_DEBUG) ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") ++ # endif() ++ # endif() ++ ++ # endif() ++ # endif() ++ ++ # if(NOT SCOTCH_TEST_RUNS) ++ # if (NOT BZIP2_FOUND) ++ # find_package(BZip2) ++ # endif() ++ ++ # if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) ++ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR}) ++ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES}) ++ ++ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS") ++ # try_run( ++ # SCOTCH_BZIP2_TEST_LIB_EXITCODE ++ # SCOTCH_BZIP2_TEST_LIB_COMPILED ++ # ${CMAKE_CURRENT_BINARY_DIR} ++ # ${SCOTCH_TEST_LIB_CPP} ++ # CMAKE_FLAGS ++ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" ++ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" ++ # COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT ++ # RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT ++ # ) ++ ++ # # Add zlib flags if required and set test run to 'true' ++ # if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0) ++ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success") ++ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR}) ++ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES}) ++ # set(SCOTCH_TEST_RUNS TRUE) ++ # else() ++ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed") ++ # if (SCOTCH_DEBUG) ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") ++ # endif() ++ # endif() ++ # endif() ++ # endif() + + endif() + endif() +-- +2.24.1 + diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild deleted file mode 100644 index 90abc7144a36..000000000000 --- a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake cuda virtualx - -MY_COMMIT="09529db4b3f458f93a0240be578d1da6f1c2dc21" - -DESCRIPTION="An auto-parallelizing library to speed up computer simulations" -HOMEPAGE=" - http://www.libgeodecomp.org - https://github.com/STEllAR-GROUP/libgeodecomp" -SRC_URI="https://github.com/STEllAR-GROUP/libgeodecomp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="Boost-1.0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="cuda doc hpx mpi opencl opencv qt5 silo" - -BDEPEND=" - doc? ( - app-doc/doxygen - app-text/texlive - media-gfx/graphviz - )" -RDEPEND="dev-libs/boost" -DEPEND="${RDEPEND} - ~dev-libs/libflatarray-0.4.0_pre20200314 - cuda? ( dev-util/nvidia-cuda-toolkit ) - hpx? ( sys-cluster/hpx ) - mpi? ( virtual/mpi ) - opencl? ( virtual/opencl ) - opencv? ( media-libs/opencv ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - silo? ( sci-libs/silo )" - -S="${WORKDIR}/libgeodecomp-${MY_COMMIT}" - -PATCHES=( - "${FILESDIR}/${P}-hpx.patch" - "${FILESDIR}/${P}-libdir.patch" - "${FILESDIR}/${P}-mpi.patch" - "${FILESDIR}/${P}-warnings.patch" -) - -src_prepare() { - cmake_src_prepare - use cuda && cuda_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_CUDA=$(usex cuda) - -DWITH_HPX=$(usex hpx) - -DWITH_MPI=$(usex mpi) - -DWITH_OPENCL=$(usex opencl) - -DWITH_OPENCV=$(usex opencv) - -DWITH_QT5=$(usex qt5) - -DWITH_SCOTCH=false - -DWITH_SILO=$(usex silo) - -DWITH_TYPEMAPS=false - -DWITH_VISIT=false - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_build doc -} - -src_install() { - DOCS=( README ) - use doc && HTML_DOCS=( doc/html/* ) - cmake_src_install -} - -src_test() { - virtx cmake_build check -} diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild new file mode 100644 index 000000000000..d269428d5cd1 --- /dev/null +++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake cuda virtualx + +MY_COMMIT="69c5573ac7b2b654d649e8902fad73b05bf33644" + +DESCRIPTION="An auto-parallelizing library to speed up computer simulations" +HOMEPAGE=" + http://www.libgeodecomp.org + https://github.com/STEllAR-GROUP/libgeodecomp" +SRC_URI="https://github.com/STEllAR-GROUP/libgeodecomp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="Boost-1.0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="cuda doc hpx mpi opencl opencv qt5 silo" + +BDEPEND=" + doc? ( + app-doc/doxygen + app-text/texlive + media-gfx/graphviz + )" +RDEPEND="dev-libs/boost" +DEPEND="${RDEPEND} + ~dev-libs/libflatarray-0.4.0_pre20200314 + cuda? ( dev-util/nvidia-cuda-toolkit ) + hpx? ( sys-cluster/hpx ) + mpi? ( virtual/mpi ) + opencl? ( virtual/opencl ) + opencv? ( media-libs/opencv ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + ) + silo? ( sci-libs/silo )" + +S="${WORKDIR}/libgeodecomp-${MY_COMMIT}" + +PATCHES=( "${FILESDIR}/${P}-mpi.patch" ) + +DOCS=( README ) + +src_prepare() { + cmake_src_prepare + use cuda && cuda_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_CUDA=$(usex cuda) + -DWITH_HPX=$(usex hpx) + -DWITH_MPI=$(usex mpi) + -DWITH_OPENCL=$(usex opencl) + -DWITH_OPENCV=$(usex opencv) + -DWITH_QT5=$(usex qt5) + -DWITH_SCOTCH=false + -DWITH_SILO=$(usex silo) + -DWITH_TYPEMAPS=false + -DWITH_VISIT=false + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_build doc +} + +src_install() { + use doc && local HTML_DOCS=( doc/html/* ) + cmake_src_install +} + +src_test() { + virtx cmake_build check +} -- cgit v1.2.3