diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2023-06-19 12:25:24 -0500 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2023-06-19 13:26:32 -0500 |
| commit | bf7994ec88eedaae653bef2b16f670506741ac83 (patch) | |
| tree | 264d5405f9ab4925f60d736e8a59eec9a3471301 /sci-libs/p4est/files | |
| parent | dev-cpp/kokkos: add 4.0.1 (diff) | |
| download | gentoo-bf7994ec88eedaae653bef2b16f670506741ac83.tar.gz gentoo-bf7994ec88eedaae653bef2b16f670506741ac83.tar.bz2 gentoo-bf7994ec88eedaae653bef2b16f670506741ac83.zip | |
sci-libs/p4est: add 2.8.5
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'sci-libs/p4est/files')
| -rw-r--r-- | sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch | 24 | ||||
| -rw-r--r-- | sci-libs/p4est/files/p4est-2.8.5-set_version.patch | 49 |
2 files changed, 73 insertions, 0 deletions
diff --git a/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch new file mode 100644 index 000000000000..0063acf9c5c1 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78c02bf..d1b2094 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/ + DESCRIPTION "p4est manages a collection---a forest---of octrees in parallel." + VERSION ${PROJECT_VERSION}) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + include(CTest) + + list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) +@@ -68,8 +70,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_BINARY_DIR}/include/ + + install(TARGETS p4est + EXPORT ${PROJECT_NAME}-targets +-ARCHIVE DESTINATION lib +-LIBRARY DESTINATION lib ++ARCHIVE DESTINATION ${library_reldir} ++LIBRARY DESTINATION ${library_reldir} + RUNTIME DESTINATION bin + ) + diff --git a/sci-libs/p4est/files/p4est-2.8.5-set_version.patch b/sci-libs/p4est/files/p4est-2.8.5-set_version.patch new file mode 100644 index 000000000000..061081a0da9e --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.5-set_version.patch @@ -0,0 +1,49 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index f88e984..f04f52b 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,39 +1,5 @@ +-# --- extract version from Git +- +-set(PROJECT_MAJOR 0) +-set(PROJECT_MINOR 0) +-set(PROJECT_PATCH 0) +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball-version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_PATCH "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_PATCH "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}) +- endif() +-endif() ++set(git_version 2.8.5) ++set(PROJECT_MAJOR 2) ++set(PROJECT_MINOR 8) ++set(PROJECT_PATCH 5) ++set(PROJECT_VERSION 2.8.5) |