From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/
Date: Tue, 18 Jul 2023 10:19:55 +0000 (UTC) [thread overview]
Message-ID: <1689675581.61c01d7438a66ab1bf7b52dd04b5df9074ca54c6.andrewammerlaan@gentoo> (raw)
commit: 61c01d7438a66ab1bf7b52dd04b5df9074ca54c6
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 17 21:01:35 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 10:19:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c01d74
sci-libs/libsc: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../libsc/files/libsc-2.8.3-fix_build_system.patch | 41 --------------------
sci-libs/libsc/files/libsc-2.8.3-set_version.patch | 44 ----------------------
2 files changed, 85 deletions(-)
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)
-
-
next reply other threads:[~2023-07-18 10:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 10:19 Andrew Ammerlaan [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-21 11:51 [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/ Andrew Ammerlaan
2022-02-22 18:59 Conrad Kostecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1689675581.61c01d7438a66ab1bf7b52dd04b5df9074ca54c6.andrewammerlaan@gentoo \
--to=andrewammerlaan@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox