diff options
author | Michael Mair-Keimberger <mmk@levelnine.at> | 2023-07-17 23:02:09 +0200 |
---|---|---|
committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2023-07-18 12:19:42 +0200 |
commit | 88661e3f7fc776f53c65f26c7acf07ae4bd0b37e (patch) | |
tree | 1ac7f7f52cb86be228a16c0db835d5f854a53b0e /sci-libs/p4est | |
parent | sci-libs/libsc: remove unused patches (diff) | |
download | gentoo-88661e3f7fc776f53c65f26c7acf07ae4bd0b37e.tar.gz gentoo-88661e3f7fc776f53c65f26c7acf07ae4bd0b37e.tar.bz2 gentoo-88661e3f7fc776f53c65f26c7acf07ae4bd0b37e.zip |
sci-libs/p4est: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31937
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sci-libs/p4est')
-rw-r--r-- | sci-libs/p4est/files/p4est-2.8-fix_build_system.patch | 24 | ||||
-rw-r--r-- | sci-libs/p4est/files/p4est-2.8-set_version.patch | 77 |
2 files changed, 0 insertions, 101 deletions
diff --git a/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch deleted file mode 100644 index e1f86165d5f9..000000000000 --- a/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3226f2e..8bc5074 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) -@@ -76,8 +78,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}) - - #--- p8est - diff --git a/sci-libs/p4est/files/p4est-2.8-set_version.patch b/sci-libs/p4est/files/p4est-2.8-set_version.patch deleted file mode 100644 index b24f265f496b..000000000000 --- a/sci-libs/p4est/files/p4est-2.8-set_version.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/cmake/git.cmake b/cmake/git.cmake -index dd6009e..7c5c8f3 100644 ---- a/cmake/git.cmake -+++ b/cmake/git.cmake -@@ -1,36 +1,3 @@ - # --- extract version from Git - --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(_major "${CMAKE_MATCH_1}") -- set(_minor "${CMAKE_MATCH_2}") -- set(_patch "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(_major "${CMAKE_MATCH_1}") -- set(_minor "${CMAKE_MATCH_2}") -- set(_patch "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(_major "${CMAKE_MATCH_1}") -- set(_minor "${CMAKE_MATCH_2}") -- set(PROJECT_VERSION ${_major}.${_minor}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)") -- set(_major "${CMAKE_MATCH_1}") -- set(PROJECT_VERSION ${_major}) -- endif() --endif() -+set(PROJECT_VERSION 2.8.3) - -diff --git a/cmake/p4est_config.h.in b/cmake/p4est_config.h.in -index 72645dd..7560dcc 100644 ---- a/cmake/p4est_config.h.in -+++ b/cmake/p4est_config.h.in -@@ -135,7 +135,7 @@ - #define P4EST_PACKAGE_NAME "p4est" - - /* Define to the full name and version of this package. */ --#define P4EST_PACKAGE_STRING "p4est 2.0.94-00da" -+#define P4EST_PACKAGE_STRING "p4est 2.8.0" - - /* Define to the one symbol short name of this package. */ - #define P4EST_PACKAGE_TARNAME "p4est" -@@ -144,16 +144,16 @@ - #define P4EST_PACKAGE_URL "" - - /* Define to the version of this package. */ --#define P4EST_PACKAGE_VERSION "2.0.94-00da" -+#define P4EST_PACKAGE_VERSION "2.8.0" - - /* Version number of package */ --#define P4EST_VERSION "2.0.94-00da" -+#define P4EST_VERSION "2.8.0" - - /* Package major version */ - #define P4EST_VERSION_MAJOR 2 - - /* Package minor version */ --#define P4EST_VERSION_MINOR 0 -+#define P4EST_VERSION_MINOR 8 - - /* Package point version */ --#define P4EST_VERSION_POINT 94-00da -+#define P4EST_VERSION_POINT 0 |