diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-07-18 13:00:52 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-18 13:00:52 +0100 |
commit | e0722f6145f1e8db6281ff135d83442091b31620 (patch) | |
tree | e12d701878d995460a24779bd4e1d7689acbeb78 /sci-libs/p4est | |
parent | dcb9c4187a31b8b770600503289d2ad39745e782 (diff) |
gentoo auto-resync : 18:07:2023 - 13:00:52
Diffstat (limited to 'sci-libs/p4est')
-rw-r--r-- | sci-libs/p4est/Manifest | 2 | ||||
-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 |
3 files changed, 0 insertions, 103 deletions
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index adcc9674797a..89d34b01a956 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -1,7 +1,5 @@ AUX p4est-2.3-fix_aclocal.patch 289 BLAKE2B 9a361db45d08f9355cef4d33079a88ceec2e804d772c806a078e07d0174906ca5c2f24580efb346654806abb2fc329b9c78b9cecb857c8369fb937c1b96e9a5b SHA512 848e65b78abc5cd74a9458289d7376cd7bc9667e96fa2baaefe7b64d9bcf34326a6f6ac040e1229f639708eabd3bedc52ba82444632ecbbe0dd33ebdba216ff7 AUX p4est-2.3.6-override_soname.patch 612 BLAKE2B b34bc5c700446526d5e93e986928202e05c3aec4a96bf1019a59eb12e905d9da3ef6ded754931245e4d8c4ce6c2d02dd8ea1ee0e90c5c69f35fc70b89599804f SHA512 7d7ca69c5211124fb3a6cf1d710b775e4f4141dad43b80900e3591d444ed538ba276878683922a596a521747e0c35598f7cf53b8ccf5999423f51ead9c158259 -AUX p4est-2.8-fix_build_system.patch 714 BLAKE2B 0807f4f896be0790fbeac3ab349abcbdf5c75f7eb57bc694f9c050772d9defe7e397c58a6b7d1da2e8c107dbd57489d971cd4ad7fa9dfedb4ee16509c5536cf3 SHA512 e2207974fc2df548a4f60e4233278641c6567aa909463de6ca61c5dc65b621b16d057735a404b73f39e0001233c800e27fae2c655a0a3c81d72d534ad04d8c0f -AUX p4est-2.8-set_version.patch 2520 BLAKE2B fb3ac44167c9b9be7a38e85437792d41e379d155f7961f5733adab1e142f6669c1d53686963d349fc9da7dc4d46fd27097c9beb223c1ab7266a4c18854aabe4a SHA512 17d128884d05999a51c28a966c66eb5fbe89512d812baa732afe372bfaf8a7bc8edf5edf1b46f5ad60353d7ee76be112dc3a7b06b8fd8fd729f5c7fbc9ac50af AUX p4est-2.8.5-fix_build_system.patch 717 BLAKE2B 87d73e6a40c4d3c4a63f81310f8fed7580c26c42d4f6e104d83ccaa05e9cade306da0b7897ed5dbad1c559b79cbec0c23b950406bc4eebf81c88942e19e2757c SHA512 b425ee30cb1e6754f2139e72984152fe3ed5df71fce1ae5d8ae797b7edd292159f700a13c431ba57177132dbe297606594a0e29aa4df407f6275e517536c3124 AUX p4est-2.8.5-fix_cmake_path.patch 1293 BLAKE2B 223471b591415a89fb62f503802a25b2e53aa16201a4582908b1e1f65701eef6d425a7c775cd6bd3d45e420cead3d2caf00fefb56591593d6033005596458cfb SHA512 cd0368b729fb6118ab0f5b48e91657e6e4452e77271178700873c9e890a5678dda5059e4679fb2770b711f45a02c12a0edbce9c154ab6ab6f456829557d745fb AUX p4est-2.8.5-set_version.patch 1794 BLAKE2B 6cdf62143d846cb40868916c2d11a290a5179f3ff2782ff60b381a2aa00ee12995762ab8b7847468776cadc062296b79b45c2c5ddb3bf49655511700186d2abc SHA512 eec7d0fb9daf4559e3ad70f1d3fc8fa422239886f293ed876552151cde8cd80d015f0672703131f28fb9009e7cfb0045b33c23abcfe477922a57c56f9d2abb2c 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 |