diff options
Diffstat (limited to 'sci-libs/libsc')
| -rw-r--r-- | sci-libs/libsc/Manifest | 2 | ||||
| -rw-r--r-- | sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch | 41 | ||||
| -rw-r--r-- | sci-libs/libsc/files/libsc-2.8.3-set_version.patch | 44 |
3 files changed, 0 insertions, 87 deletions
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index 8aa5cbeb31cd..43256c74837b 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1,7 +1,5 @@ AUX libsc-2.3-autoconf_lua_version.patch 1790 BLAKE2B 7968b643acddc54f81b06028392ee328143f280178ed4a52e4a7eabc85906f043b9edd82cf7c0ef7c4956cee59602bb231e0051da162538419de3b9b88c7a57d SHA512 6c3c183b5255296ac0340845b94d39e6aa1f4675a6fc44ea139635e73aca7a4d8eb02d14a7e9599723ca9d0702c911c3d20102a95c3d4ff1ed941b565a5f9cf7 AUX libsc-2.3.6-override_soname.patch 538 BLAKE2B df4cdc816d0b1ba3c023bf28e97ec60437d3fe51a962a1f4ce25269f86fba86c084733907b135b165431902b993cf506f05e5b66923851616025dd2e49da0bce SHA512 3d58d2a7144a9e2d0c60d1753e4a3db83cc1a7beab154bb4bcc1c7958a012ca2dfb9730b217ce54d61056d26e4aa35fbc49975969869b044b3a9fc0d4890fdd6 -AUX libsc-2.8.3-fix_build_system.patch 1192 BLAKE2B aab3161036987ad1027266c03730141142ab0e86c292dd827cc7010a6cb7a3ba43153bec8bc8319bca80cc5ec97efc9fd10b2f47d126e235fe7d948bf78a6acc SHA512 84264530c72d71f2b77c16037e389f4423e3acda8bba4443ec3d0a4e0d46a1eb6ae3ef85973a56ea990d19987799e1dfc682dee0a039f598f9ef122a262f01f6 -AUX libsc-2.8.3-set_version.patch 1514 BLAKE2B 59e06b4f4d33a641e66ff862ca212b4106dd98214b411a95340c8069ec0cef6c70ac467fa01b94e61a16cd0222cfa5e50c56f6ed088958bfbaeaea2272c1c477 SHA512 20723ffda489e249ed2af124f4ca13b6f477dfc09d7bdc07e8c36f55fd0d168807543b6573b3e1d86fd1200b6982d7a755d7b9b04c39097f39f38aeba5b67e2d AUX libsc-2.8.5-do_not_compile_zlib-ng.patch 1866 BLAKE2B 1c9bfc20a1e62fd1cdd51393db6b2419f0e3f04dfc05e1af64a3cb42bc5bbf032b35e2bcc435cbe9800e53f2011906d22a26287ab7a6a4c85f44a2bddf839903 SHA512 c2041844d47308fa0d17b74f20fd9408bca2fe458674cdf7f4180700b0c9407451c48d5bb7a8bd3ff90f8958d9fc8a1007cc6164d1eb4f9d016fd4102a862250 AUX libsc-2.8.5-fix_build_system.patch 696 BLAKE2B fee1ddbd18c2e7155d22e862802479ccc0435fde2678e6c7b9ff59d11ba84751186fe2576b8ea9a6a08739680407d37c2e5b764084324383dd2f1d5b6d2bf9c3 SHA512 1ec73af77dcd467c0b00069cb96f594f422c631421b5d48b4225d8fe6b237bc388ff3e2f1a76007e15b3a228662d2630366149ba438f1c2b332c0e419419ab1c AUX libsc-2.8.5-fix_cmake_path.patch 918 BLAKE2B 0c9a2a228e204f7255ca74418d44903357186898fac65e45fdf49e4f25d3985e0f7e51a11d80f4f3baaca2d9b8a1524e09a3cc75f66ec0837151b04c34ec6ab2 SHA512 c40db6baa1e440fb6ce37e24471a25dcd0ae020481991924ef57c4e980734359107bcb1d858d29f15d8c8d4da8d67b353e309276ec1103332697c92cb3401aea diff --git a/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch deleted file mode 100644 index b5bdc734ab55..000000000000 --- a/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://github.com/cburstedde/libsc/pull/54 -https://github.com/cburstedde/libsc/pull/55 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ce08e2..a588beb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/ - DESCRIPTION "The SC library supports parallel scientific applications." - VERSION ${PROJECT_VERSION}) - -+set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - include(CTest) - - include(cmake/options.cmake) -@@ -28,8 +30,7 @@ if(MPI_FOUND) - endif() - - # --- libb64 --add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c -- libb64/b64dec.c libb64/b64enc.c) -+add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c) - target_include_directories(libb64 PRIVATE libb64) - - # --- sc -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a588beb..aff0eca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -64,8 +64,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_SOURCE_DIR}/src/sc_builti - - install(TARGETS sc - EXPORT ${PROJECT_NAME}Targets -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib) -+ ARCHIVE DESTINATION ${library_reldir} -+ LIBRARY DESTINATION ${library_reldir}) - - add_subdirectory(src) - diff --git a/sci-libs/libsc/files/libsc-2.8.3-set_version.patch b/sci-libs/libsc/files/libsc-2.8.3-set_version.patch deleted file mode 100644 index dcd63994cc67..000000000000 --- a/sci-libs/libsc/files/libsc-2.8.3-set_version.patch +++ /dev/null @@ -1,44 +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) - - |