Skip to content

Commit

Permalink
sci-libs/libgeodecomp: Add current version
Browse files Browse the repository at this point in the history
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@kmk-computers.de>
  • Loading branch information
shifty91 committed Mar 14, 2020
1 parent c7331ba commit eb13869
Show file tree
Hide file tree
Showing 4 changed files with 409 additions and 0 deletions.
1 change: 1 addition & 0 deletions sci-libs/libgeodecomp/Manifest
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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

292 changes: 292 additions & 0 deletions sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit eb13869

Please sign in to comment.