* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/files/, sci-libs/libgeodecomp/
@ 2019-03-20 21:38 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2019-03-20 21:38 UTC (permalink / raw
To: gentoo-commits
commit: f8b681779a0642c552d95f0d57a5204591b4995b
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Mon Feb 18 20:56:29 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 21:35:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8b68177
sci-libs/libgeodecomp: add version 0.4.0.
Add support for libgeodecomp version 0.4.0.
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/11180
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
sci-libs/libgeodecomp/Manifest | 1 +
.../files/libgeodecomp-0.4.0-libdir.patch | 19 +++
.../files/libgeodecomp-0.4.0-scotch.patch | 163 +++++++++++++++++++++
sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild | 67 +++++++++
sci-libs/libgeodecomp/metadata.xml | 30 ++++
5 files changed, 280 insertions(+)
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 16412dc113f..2a8bfc9f286 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1 +1,2 @@
DIST libgeodecomp-0.3.1.tar.bz2 740341 BLAKE2B f08f4a7e1b8666d20e40a21d494dbd1cf54b38bae90f451a1b239038e313ae692d39e81d2182cd018d85a4dfc298394c74da2d36218d379e226807feb9ff2cc3 SHA512 28f0ea04e45cb0a5b81b18efd3e3a011d58c077562f8039ff42e701cc362f86dff90bd505690ec22c8a42e9de1236d5b6c61d288ad4c154289e92700a2a7fcc0
+DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch
new file mode 100644
index 00000000000..39da128feff
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 00000000000..774293f34c4
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch
@@ -0,0 +1,163 @@
+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/libgeodecomp-0.4.0.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
new file mode 100644
index 00000000000..98fd350e079
--- /dev/null
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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 ~x86"
+IUSE="doc mpi cuda opencl opencv silo hpx visit"
+
+RDEPEND=">=dev-libs/boost-1.48"
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ app-text/texlive
+ media-gfx/graphviz
+ )
+ mpi? ( virtual/mpi )
+ cuda? ( dev-util/nvidia-cuda-toolkit )
+ opencl? ( virtual/opencl )
+ opencv? ( media-libs/opencv )
+ silo? ( sci-libs/silo )
+ hpx? ( sys-cluster/hpx )
+ visit? ( sci-visualization/visit )"
+
+S="${WORKDIR}/${P}"
+PATCHES=( "${FILESDIR}/${P}-scotch.patch" "${FILESDIR}/${P}-libdir.patch" )
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use cuda && cuda_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_MPI=$(usex mpi)
+ -DWITH_CUDA=$(usex cuda)
+ -DWITH_OPENCL=$(usex opencl)
+ -DWITH_OPENCV=$(usex opencv)
+ -DWITH_SILO=$(usex silo)
+ -DWITH_SCOTCH=false
+ -DWITH_HPX=$(usex hpx)
+ -DWITH_VISIT=$(usex visit)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_make doc
+}
+
+src_install() {
+ DOCS=( README )
+ use doc && HTML_DOCS=( doc/html/* )
+ cmake-utils_src_install
+}
+
+src_test() {
+ cmake-utils_src_make check
+}
diff --git a/sci-libs/libgeodecomp/metadata.xml b/sci-libs/libgeodecomp/metadata.xml
index 9c43c5cbc14..a3c9cd3cd67 100644
--- a/sci-libs/libgeodecomp/metadata.xml
+++ b/sci-libs/libgeodecomp/metadata.xml
@@ -4,4 +4,34 @@
<maintainer type="person">
<email>slis@gentoo.org</email>
</maintainer>
+ <longdescription>
+ LibGeoDecomp (Library for Geometric Decomposition codes) is an
+ auto-parallelizing library for computer simulations. It is specifically
+ targeted computational science applications in the context of supercomputers
+ and heterogeneous systems. The library eases development of such tightly
+ coupled codes by essentially taking over the parallel programming: it
+ handles both, the parallelization itself and parameter tuning. This enables
+ scientists to focus on their simulation code, rather than the technical
+ details of the parallel computer.
+ </longdescription>
+ <use>
+ <flag name="cuda">
+ Enables plugins for NVIDIA GPUs
+ </flag>
+ <flag name="opencl">
+ Enables OpenCL backend
+ </flag>
+ <flag name="opencv">
+ Enables OpenCV related code
+ </flag>
+ <flag name="silo">
+ Enables SILO related code
+ </flag>
+ <flag name="hpx">
+ Enables HPX backend
+ </flag>
+ <flag name="visit">
+ Enables VisIt related code
+ </flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/files/, sci-libs/libgeodecomp/
@ 2019-05-15 17:11 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-05-15 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 9b498d0b2141ab6a8eb7436be15d993213e34996
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 17:03:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 15 17:04:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b498d0b
sci-libs/libgeodecomp: Drop 0.3.1
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/libgeodecomp/Manifest | 1 -
sci-libs/libgeodecomp/files/libflatarray.patch | 11 ------
sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild | 49 -------------------------
3 files changed, 61 deletions(-)
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 2a8bfc9f286..ef2ab8796da 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,2 +1 @@
-DIST libgeodecomp-0.3.1.tar.bz2 740341 BLAKE2B f08f4a7e1b8666d20e40a21d494dbd1cf54b38bae90f451a1b239038e313ae692d39e81d2182cd018d85a4dfc298394c74da2d36218d379e226807feb9ff2cc3 SHA512 28f0ea04e45cb0a5b81b18efd3e3a011d58c077562f8039ff42e701cc362f86dff90bd505690ec22c8a42e9de1236d5b6c61d288ad4c154289e92700a2a7fcc0
DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
diff --git a/sci-libs/libgeodecomp/files/libflatarray.patch b/sci-libs/libgeodecomp/files/libflatarray.patch
deleted file mode 100644
index 8a109d98657..00000000000
--- a/sci-libs/libgeodecomp/files/libflatarray.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/CMakeLists.txt.orig 2015-05-06 07:03:21.508147301 +0200
-+++ src/CMakeLists.txt 2015-05-06 07:03:27.038147363 +0200
-@@ -439,7 +439,7 @@
- install(FILES ${HEADERS} DESTINATION include/${PACKAGE_NAME}/${dir})
- endforeach(dir)
- # install libflatarray, too
--install(FILES ../lib/libflatarray/src/flat_array.hpp DESTINATION include/libflatarray)
-+#install(FILES ../lib/libflatarray/src/flat_array.hpp DESTINATION include/libflatarray)
-
- # link against the libs we need
- set(INSTALLER_LINK_FLAGS "-L\${libdir} -lgeodecomp ")
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
deleted file mode 100644
index 739df1ee915..00000000000
--- a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-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="doc examples"
-
-RDEPEND=">=dev-libs/boost-1.48"
-DEPEND="${RDEPEND}
- dev-libs/libflatarray
- examples? ( !sys-cluster/mpich2 )"
-
-S="${WORKDIR}/${P}/src"
-PATCHES=( "${FILESDIR}/libflatarray.patch" )
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i 's/libdir=${CMAKE_INSTALL_PREFIX}\/lib/libdir=\/usr\/'$(get_libdir)'/' "${S}/CMakeLists.txt"
- sed -i 's/install(TARGETS geodecomp DESTINATION lib)/install(TARGETS geodecomp DESTINATION '$(get_libdir)')/' "${S}/CMakeLists.txt"
-
- if ! use examples ; then
- sed -i 's/examples//g' CMakeLists.txt
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_make doc
-}
-
-src_install() {
- DOCS=( ../README )
- use doc && HTML_DOCS=( ../doc/html/* )
- cmake-utils_src_install
-}
-
-src_test() {
- cmake-utils_src_make test
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/files/, sci-libs/libgeodecomp/
@ 2020-03-15 17:52 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-03-15 17:52 UTC (permalink / raw
To: gentoo-commits
commit: ac3473874f431d2047da57f71c253146ae8f243c
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun Mar 8 11:33:31 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 17:51:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac347387
sci-libs/libgeodecomp: Fix boost detection
When hpx is installed libgeodecomp tries to use the boost libraries detected by
hpx. That doesn't work, because the wrong variables are referenced and hpx uses
fewer boost libraries than libgeodecomp.
So remove that and use the system boost libraries in all cases.
Closes: https://bugs.gentoo.org/686294
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/14855
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/libgeodecomp-0.4.0-boost.patch | 92 ++++++++++++++++++++++
sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild | 1 +
2 files changed, 93 insertions(+)
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-boost.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-boost.patch
new file mode 100644
index 00000000000..d706950af59
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-boost.patch
@@ -0,0 +1,92 @@
+From f964fc68b745cc200a1df9e442a2dd8e908f0248 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Sun, 8 Mar 2020 10:53:53 +0100
+Subject: [PATCH] cmake: Disable use of HPX boost libraries
+
+First of all the wrong variables are referenced. Second HPX doesn't include
+date_time which is needed by the tracing writer. So that does not work.
+
+Use the system boost libraries.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ src/CMakeLists.txt | 60 +++++++++++++++++-----------------------------
+ 1 file changed, 22 insertions(+), 38 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2870446108d0..f1a15abb0161 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -2,47 +2,31 @@
+
+ find_package(HPX)
+
+-if(NOT HPX_FOUND)
+- if(NOT DEFINED BOOST_ROOT)
+- # deduce Boost location from environment (e.g. on woody.rrze.uni-erlangen.de)
+- set(BOOST_ENV_LIBDIR "$ENV{BOOST_LIBDIR}")
+- if(BOOST_ENV_LIBDIR)
+- set(Boost_NO_SYSTEM_PATHS true)
+- set(BOOST_ROOT "$ENV{BOOST_LIBDIR}/../")
+- set(Boost_LIBRARY_DIRS "$ENV{BOOST_LIBDIR}")
+- set(Boost_INCLUDE_DIR "$ENV{BOOST_INCDIR}")
+- endif()
++if(NOT DEFINED BOOST_ROOT)
++ # deduce Boost location from environment (e.g. on woody.rrze.uni-erlangen.de)
++ set(BOOST_ENV_LIBDIR "$ENV{BOOST_LIBDIR}")
++ if(BOOST_ENV_LIBDIR)
++ set(Boost_NO_SYSTEM_PATHS true)
++ set(BOOST_ROOT "$ENV{BOOST_LIBDIR}/../")
++ set(Boost_LIBRARY_DIRS "$ENV{BOOST_LIBDIR}")
++ set(Boost_INCLUDE_DIR "$ENV{BOOST_INCDIR}")
+ endif()
+-
+- # mandatory Boost libs go into the first line, optional ones into
+- # their own call. This avoids leaving out any available lib during
+- # link time. The reason for this ugly multi-stage discovery is the
+- # following: since CMAKE 2.8.11 each call to find_package(Boost...)
+- # will reset Boost_LIBRARIES.
+- find_package(Boost REQUIRED COMPONENTS date_time filesystem system)
+- set(ALL_BOOST_LIBS "${Boost_LIBRARIES}")
+- find_package(Boost COMPONENTS serialization)
+- set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
+- find_package(Boost COMPONENTS thread)
+- set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
+- find_package(Boost COMPONENTS move)
+- set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
+-else()
+- # If HPX was found, we use the Boost libraries found by HPX
+- set(ALL_BOOST_LIBS
+- ${HPX_BOOST_DATE_TIME_LIBRARY}
+- ${HPX_BOOST_FILESYSTEM_LIBRARY}
+- ${HPX_BOOST_SYSTEM_LIBRARY}
+- ${HPX_BOOST_SERIALIZATION_LIBRARY}
+- ${HPX_BOOST_THREAD_LIBRARY}
+- )
+- set(Boost_DATE_TIME_FOUND true)
+- set(Boost_FILESYSTEM_FOUND true)
+- set(Boost_SYSTEM_FOUND true)
+- set(Boost_SERIALIZATION_FOUND true)
+- set(Boost_THREAD_FOUND true)
+ endif()
+
++# mandatory Boost libs go into the first line, optional ones into
++# their own call. This avoids leaving out any available lib during
++# link time. The reason for this ugly multi-stage discovery is the
++# following: since CMAKE 2.8.11 each call to find_package(Boost...)
++# will reset Boost_LIBRARIES.
++find_package(Boost REQUIRED COMPONENTS date_time filesystem system)
++set(ALL_BOOST_LIBS "${Boost_LIBRARIES}")
++find_package(Boost COMPONENTS serialization)
++set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
++find_package(Boost COMPONENTS thread)
++set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
++find_package(Boost COMPONENTS move)
++set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
++
+ find_package(Boost COMPONENTS mpi)
+ set(Boost_MPI_LIBRARIES "${Boost_LIBRARIES}")
+
+--
+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
index d2867f448c3..d1c5b322934 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}/${P}-scotch.patch"
"${FILESDIR}/${P}-libdir.patch"
"${FILESDIR}/${P}-lfa.patch"
+ "${FILESDIR}/${P}-boost.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/files/, sci-libs/libgeodecomp/
@ 2020-03-15 17:52 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-03-15 17:52 UTC (permalink / raw
To: gentoo-commits
commit: e5297238e65e3aa0a7b07ea2521c2737aec17acb
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Mar 7 11:13:54 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 17:51:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5297238
sci-libs/libgeodecomp: Add current version
Version v0.4.0 is quite old. Thus it makes sense to add the possibility to build
from the current source code.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/libgeodecomp/Manifest | 1 +
.../libgeodecomp-0.5.0_pre20200314-libdir.patch | 32 +++
.../files/libgeodecomp-0.5.0_pre20200314-mpi.patch | 292 +++++++++++++++++++++
.../libgeodecomp-0.5.0_pre20200314.ebuild | 84 ++++++
4 files changed, 409 insertions(+)
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index ef2ab8796da..a74db5cd610 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1 +1,2 @@
DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
+DIST libgeodecomp-0.5.0_pre20200314.tar.gz 1506929 BLAKE2B 078a0d3384963b0d3b5e5885d794b4feb6493ab3c4d4df068c300769f6bd8ee1d695accec0f4a702b218d725cc68889450d7d4fbddd495387e75a6804bbd8de9 SHA512 5bc23ce68d91d3cb8ec753a09efc4d7c46aab3c307c529f2f2e09593d14bcb027532aeea32ba99ce524cc6dfb248e983a040f482a47784f5da6fb07aac06a859
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 00000000000..d76930d83ca
--- /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 <kurt@kmk-computers.de>
+Date: Fri, 21 Feb 2020 19:47:51 +0100
+Subject: [PATCH] cmake: Fix library installation directory
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ 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 00000000000..1a1164e342b
--- /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 <kurt@kmk-computers.de>
+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 <kurt@kmk-computers.de>
+---
+ 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
new file mode 100644
index 00000000000..a14dc9c0714
--- /dev/null
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild
@@ -0,0 +1,84 @@
+# 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}-mpi.patch"
+ "${FILESDIR}/${P}-libdir.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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/files/, sci-libs/libgeodecomp/
@ 2020-04-21 12:45 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-04-21 12:45 UTC (permalink / raw
To: gentoo-commits
commit: e269b45c27b072c0ed698b933b03c349009adb7d
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Mon Apr 20 18:42:40 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 12:44:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e269b45c
sci-libs/libgeodecomp: Bump version to 0.5-pre20200420
That version contains bugfixes.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/libgeodecomp/Manifest | 1 +
.../files/libgeodecomp-0.5.0_pre20200420-mpi.patch | 292 +++++++++++++++++++++
.../libgeodecomp-0.5.0_pre20200420.ebuild | 81 ++++++
3 files changed, 374 insertions(+)
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index b0aab143193..430111edb1e 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1 +1,2 @@
DIST libgeodecomp-0.5.0_pre20200314.tar.gz 1506929 BLAKE2B 078a0d3384963b0d3b5e5885d794b4feb6493ab3c4d4df068c300769f6bd8ee1d695accec0f4a702b218d725cc68889450d7d4fbddd495387e75a6804bbd8de9 SHA512 5bc23ce68d91d3cb8ec753a09efc4d7c46aab3c307c529f2f2e09593d14bcb027532aeea32ba99ce524cc6dfb248e983a040f482a47784f5da6fb07aac06a859
+DIST libgeodecomp-0.5.0_pre20200420.tar.gz 1507078 BLAKE2B 64d5c9a138c54175ce049a1a02def90553bca617b22c9ac5fa93cd66aebfd7892f5a458f2d3eb3dd987d3c897cbb338b64cb64af7447f6ae74b41d02a762888e SHA512 0e1caa011641fba5af3c32f165fc95ced578ebeb45cb7ef56f1ede416f2e6aef532569a85339e48b43b0050bbfb60ffa1760604577c07137590445a87e691c70
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 00000000000..1a1164e342b
--- /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 <kurt@kmk-computers.de>
+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 <kurt@kmk-computers.de>
+---
+ 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_pre20200420.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild
new file mode 100644
index 00000000000..17e4963ccb8
--- /dev/null
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild
@@ -0,0 +1,81 @@
+# 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" )
+
+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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/files/, sci-libs/libgeodecomp/
@ 2020-04-21 12:45 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-04-21 12:45 UTC (permalink / raw
To: gentoo-commits
commit: 91d45449b666a5ba02c170596dd944226e89c010
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Mon Apr 20 18:44:33 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 12:44:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d45449
sci-libs/libgeodecomp: Drop old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/15443
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/libgeodecomp/Manifest | 1 -
.../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 ---
.../libgeodecomp-0.5.0_pre20200314.ebuild | 86 ------
6 files changed, 690 deletions(-)
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 430111edb1e..01dad4a3f83 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,2 +1 @@
-DIST libgeodecomp-0.5.0_pre20200314.tar.gz 1506929 BLAKE2B 078a0d3384963b0d3b5e5885d794b4feb6493ab3c4d4df068c300769f6bd8ee1d695accec0f4a702b218d725cc68889450d7d4fbddd495387e75a6804bbd8de9 SHA512 5bc23ce68d91d3cb8ec753a09efc4d7c46aab3c307c529f2f2e09593d14bcb027532aeea32ba99ce524cc6dfb248e983a040f482a47784f5da6fb07aac06a859
DIST libgeodecomp-0.5.0_pre20200420.tar.gz 1507078 BLAKE2B 64d5c9a138c54175ce049a1a02def90553bca617b22c9ac5fa93cd66aebfd7892f5a458f2d3eb3dd987d3c897cbb338b64cb64af7447f6ae74b41d02a762888e SHA512 0e1caa011641fba5af3c32f165fc95ced578ebeb45cb7ef56f1ede416f2e6aef532569a85339e48b43b0050bbfb60ffa1760604577c07137590445a87e691c70
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 9f71ea087c6..00000000000
--- 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 <kurt@kmk-computers.de>
-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 <kurt@kmk-computers.de>
----
- 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 <hpx/include/components.hpp>
- #include <hpx/include/lcos.hpp>
--#include <hpx/lcos/broadcast.hpp>
--#include <hpx/lcos/local/receive_buffer.hpp>
-+#include <hpx/collectives/broadcast.hpp>
-+#include <hpx/local_lcos/receive_buffer.hpp>
- #include <hpx/runtime/get_ptr.hpp>
--#include <hpx/util/unwrapped.hpp>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
- #include <libgeodecomp/misc/stringops.h>
-
-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 <libgeodecomp/communication/hpxserialization.h>
--#include <hpx/runtime/serialization/map.hpp>
--#include <hpx/runtime/serialization/serialize.hpp>
--#include <hpx/runtime/serialization/shared_ptr.hpp>
--#include <hpx/runtime/serialization/vector.hpp>
-+#include <hpx/serialization/map.hpp>
-+#include <hpx/serialization/serialize.hpp>
-+#include <hpx/serialization/shared_ptr.hpp>
-+#include <hpx/serialization/vector.hpp>
-
- #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 <cxxtest/TestSuite.h>
- #include <hpx/hpx.hpp>
--#include <hpx/lcos/broadcast.hpp>
-+#include <hpx/collectives/broadcast.hpp>
- #include <hpx/runtime/components/component_factory.hpp>
--#include <hpx/runtime/serialization/serialize_buffer.hpp>
--#include <hpx/util/unwrapped.hpp>
-+#include <hpx/serialization/serialize_buffer.hpp>
- #include <libgeodecomp/communication/hpxreceiver.h>
- #include <libgeodecomp/misc/stringops.h>
-
-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 <libgeodecomp/misc/cudaboostworkaround.h>
- #include <hpx/config.hpp>
--#include <hpx/runtime/serialization/array.hpp>
--#include <hpx/runtime/serialization/serialize.hpp>
-+#include <hpx/serialization/array.hpp>
-+#include <hpx/serialization/serialize.hpp>
- #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 <sstream>
- #include <libgeodecomp/io/steerer.h>
-
-+#ifdef LIBGEODECOMP_WITH_HPX
-+#include <hpx/include/threads.hpp>
-+#include <hpx/concurrency/spinlock.hpp>
-+#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 <libgeodecomp/misc/clonable.h>
- #include <libgeodecomp/misc/testcell.h>
-
-+#ifdef LIBGEODECOMP_WITH_HPX
-+#include <hpx/include/threads.hpp>
-+#include <hpx/concurrency/spinlock.hpp>
-+#endif
-+
- #include <sstream>
-
- 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 <libgeodecomp/misc/cudaboostworkaround.h>
--#include <hpx/runtime/serialization/base_object.hpp>
-+#include <hpx/serialization/base_object.hpp>
- #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 <hpx/runtime/serialization/set.hpp>
-+#include <hpx/serialization/set.hpp>
- #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 <libgeodecomp/parallelization/hpxsimulator.h>
- #include <hpx/include/lcos.hpp>
--#include <hpx/lcos/broadcast.hpp>
-+#include <hpx/collectives/broadcast.hpp>
-
- 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 <libgeodecomp/misc/cudaboostworkaround.h>
- #include <hpx/config.hpp>
--#include <hpx/runtime/serialization/set.hpp>
--#include <hpx/runtime/serialization/string.hpp>
--#include <hpx/runtime/serialization/vector.hpp>
--#include <hpx/include/lcos.hpp>
--#include <hpx/lcos/broadcast.hpp>
-+#include <hpx/serialization/set.hpp>
-+#include <hpx/serialization/string.hpp>
-+#include <hpx/serialization/vector.hpp>
-+#include <hpx/collectives/broadcast.hpp>
-
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
- #include <libgeodecomp/geometry/partitions/stripingpartition.h>
-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 <libgeodecomp/misc/cudaboostworkaround.h>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
--#include <hpx/runtime/serialization/input_archive.hpp>
--#include <hpx/runtime/serialization/output_archive.hpp>
-+#include <hpx/serialization/input_archive.hpp>
-+#include <hpx/serialization/output_archive.hpp>
- #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 <libgeodecomp/misc/cudaboostworkaround.h>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
--#include <hpx/runtime/serialization/input_archive.hpp>
--#include <hpx/runtime/serialization/output_archive.hpp>
-+#include <hpx/serialization/input_archive.hpp>
-+#include <hpx/serialization/output_archive.hpp>
- #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 <hpx/lcos/local/spinlock.hpp>
-+#include <hpx/include/threads.hpp>
-+#include <hpx/synchronization/spinlock.hpp>
- #include <mutex>
- #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 <libgeodecomp/misc/cudaboostworkaround.h>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
--#include <hpx/runtime/serialization/input_archive.hpp>
--#include <hpx/runtime/serialization/output_archive.hpp>
-+#include <hpx/serialization/input_archive.hpp>
-+#include <hpx/serialization/output_archive.hpp>
- #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 d76930d83ca..00000000000
--- 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 <kurt@kmk-computers.de>
-Date: Fri, 21 Feb 2020 19:47:51 +0100
-Subject: [PATCH] cmake: Fix library installation directory
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- 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 1a1164e342b..00000000000
--- 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 <kurt@kmk-computers.de>
-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 <kurt@kmk-computers.de>
----
- 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 2a7acd0c655..00000000000
--- 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 <kurt@kmk-computers.de>
-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 <kurt@kmk-computers.de>
----
- 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.5.0_pre20200314.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild
deleted file mode 100644
index 90abc7144a3..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-04-21 12:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-15 17:52 [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/files/, sci-libs/libgeodecomp/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2020-04-21 12:45 Joonas Niilola
2020-04-21 12:45 Joonas Niilola
2020-03-15 17:52 Joonas Niilola
2019-05-15 17:11 Andreas Sturmlechner
2019-03-20 21:38 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox