From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- sci-libs/libgeodecomp/Manifest | 11 +- .../files/libgeodecomp-0.4.0-lfa.patch | 37 --- .../files/libgeodecomp-0.4.0-libdir.patch | 19 -- .../files/libgeodecomp-0.4.0-scotch.patch | 163 ------------ .../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 +++ sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild | 73 ------ .../libgeodecomp-0.5.0_pre20200314.ebuild | 86 ++++++ 10 files changed, 695 insertions(+), 297 deletions(-) delete mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch delete mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch delete mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch create mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch create mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch create mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch create mode 100644 sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch delete mode 100644 sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild create mode 100644 sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild (limited to 'sci-libs/libgeodecomp') diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest index 47c1a81656b2..b13b3f8edbe9 100644 --- a/sci-libs/libgeodecomp/Manifest +++ b/sci-libs/libgeodecomp/Manifest @@ -1,6 +1,7 @@ -AUX libgeodecomp-0.4.0-lfa.patch 1548 BLAKE2B f5cce98b02e24bcf34ab803ea323351fe56fb382d388b20072b2a3dea5437392601efd39d6a388630f22b8533fb1b5071ed4438a41d1035e58ec9277ffcb542d SHA512 84761ef464e2b69d34718f148571a60edb4d9cb15d920b637b529850a922b284bec0375806e2f021544ccac5ad8645aeee0ee12299866c7179437057cceabdd6 -AUX libgeodecomp-0.4.0-libdir.patch 694 BLAKE2B 87b08665e9f1d236183f7bfaaf34ef5a9839e28f7a94a6b870fe99d19603b11f152227137202be5669c9f9cd2ba65b3f559eba9ca2460676f19c22e0911ab36e SHA512 fa8e0e08b45d9250d6f32e1a8ade6ff8bdb8acb7951115916cee7b6df600800f8aa64cfb92e13bb5b108af98e8ac2b1f127f34b415648ebe556a589bb11af68d -AUX libgeodecomp-0.4.0-scotch.patch 7962 BLAKE2B e47365810132838ba0afc63dead520a17d866c0c6b5c2c2bf8f7299d688bcf10ef34ff19d1b29a29d3388101f082080b5943b037fdc9aedf937b392ffb46a68a SHA512 78d805aedb820b457ae01e5f35c530edf7de014cc60c640314cefb1cdfa88f54a6128fb56a81e974fed9d0620e56c31a8f97922d78e88d729bbf3c29c71f7f5d -DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb -EBUILD libgeodecomp-0.4.0-r1.ebuild 1434 BLAKE2B ee8d11d32eafe469a1d0ccf59203b8ff155d81909685d3b9abbde22f300d5ebd99960415fbe77a3bc3631299d4c426948ec8ed4522e22e35670e043080390ca4 SHA512 9c63b5d6d1a0b02482beab0c7db730f11bb8d067b0bc18057b75519152a5aebd5c328ec81271daf2878c16be090282289a445127f6c834ee68c5c3e5f4ee77fb +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 MISC metadata.xml 1345 BLAKE2B d6cb11021ade1a8c9007bf7a57c1e9355e19331498b66f746405bbd52dd5562656e827ab1db290190c37b283f579512609cf730d0ea27f6c31629d7e1fc38266 SHA512 f377ab4249dc9bb3dc2518e7d86ad6c2b44cd1249474480a5a71aa5b944c220ddc1608a8171d1abeaffa3d4628f4f327956cfb412ac14336f75705b7d8fe0fd9 diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch deleted file mode 100644 index 463d416b3bf6..000000000000 --- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 673017f0..28704461 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -528,18 +528,20 @@ foreach(dir ${LIBDIRS}) - endforeach(dir) - - # install libflatarray, too --file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/*.hpp") --foreach(i ${HEADERS}) -- install(FILES ${i} DESTINATION include/libflatarray) --endforeach() --file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/detail/*.hpp") --foreach(i ${HEADERS}) -- install(FILES ${i} DESTINATION include/libflatarray/detail) --endforeach() --file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/testbed/*.hpp") --foreach(i ${HEADERS}) -- install(FILES ${i} DESTINATION include/libflatarray/testbed) --endforeach() -+if(NOT libflatarray_FOUND) -+ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/*.hpp") -+ foreach(i ${HEADERS}) -+ install(FILES ${i} DESTINATION include/libflatarray) -+ endforeach() -+ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/detail/*.hpp") -+ foreach(i ${HEADERS}) -+ install(FILES ${i} DESTINATION include/libflatarray/detail) -+ endforeach() -+ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/testbed/*.hpp") -+ foreach(i ${HEADERS}) -+ install(FILES ${i} DESTINATION include/libflatarray/testbed) -+ endforeach() -+endif() - - # link against the libs we need - set(INSTALLER_LINK_FLAGS "-L${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -lgeodecomp ") diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch deleted file mode 100644 index 39da128feff8..000000000000 --- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0666f1d..673017f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -509,11 +509,12 @@ endif() - target_link_libraries(geodecomp ${LIBGEODECOMP_LINK_LIBRARIES}) - - #============= 10. 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) diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch deleted file mode 100644 index 774293f34c4a..000000000000 --- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake -index 9f22b8d..0755470 100644 ---- a/CMakeModules/FindSCOTCH.cmake -+++ b/CMakeModules/FindSCOTCH.cmake -@@ -232,81 +232,83 @@ 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() -+ set(SCOTCH_TEST_RUNS FALSE) -+ message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") -+ # 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() - endif() - endif() - 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 new file mode 100644 index 000000000000..9f71ea087c69 --- /dev/null +++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch @@ -0,0 +1,246 @@ +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 new file mode 100644 index 000000000000..d76930d83ca1 --- /dev/null +++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 000000000000..1a1164e342be --- /dev/null +++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-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/files/libgeodecomp-0.5.0_pre20200314-warnings.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch new file mode 100644 index 000000000000..2a7acd0c655b --- /dev/null +++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch @@ -0,0 +1,33 @@ +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/libgeodecomp-0.4.0-r1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild deleted file mode 100644 index 098ddbd3a50d..000000000000 --- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake cuda - -DESCRIPTION="An auto-parallelizing library to speed up computer simulations" -HOMEPAGE="http://www.libgeodecomp.org" -SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2" - -SLOT="0" -LICENSE="Boost-1.0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="cuda doc hpx mpi opencl opencv silo" - -BDEPEND=" - doc? ( - app-doc/doxygen - app-text/texlive - media-gfx/graphviz - )" -RDEPEND=">=dev-libs/boost-1.48" -DEPEND="${RDEPEND} - hpx? ( sys-cluster/hpx ) -