* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/
@ 2022-02-22 18:59 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2022-02-22 18:59 UTC (permalink / raw
To: gentoo-commits
commit: 74aedb014ae5cb8a48aedd47f430fb86dcda8ade
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Feb 18 18:52:55 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 18:59:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74aedb01
sci-libs/libsc: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/24253
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../libsc-9999_20201220-autoconf_lua_version.patch | 57 ----------------------
1 file changed, 57 deletions(-)
diff --git a/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch
deleted file mode 100644
index c138bb3fc4ba..000000000000
--- a/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/config/sc_include.m4
-+++ b/config/sc_include.m4
-@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES],
- [
- SC_REQUIRE_LIB([m], [fabs])
- SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1])
--SC_CHECK_LIB([lua53 lua5.3 lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable],
-+SC_CHECK_LIB([$LUA_IMPL], [lua_createtable],
- [LUA], [$1])
- SC_CHECK_BLAS_LAPACK([$1])
- SC_BUILTIN_ALL_PREFIX([$1])
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,7 +74,7 @@ echo "| Checking headers"
- echo "o---------------------------------------"
-
- AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h])
--AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h])
-+AC_CHECK_HEADERS([$LUA_IMPL/lua.h])
-
- echo "o---------------------------------------"
- echo "| Checking functions"
---- a/src/sc_lua.h
-+++ b/src/sc_lua.h
-@@ -30,29 +30,9 @@
-
- SC_EXTERN_C_BEGIN;
-
--#ifdef SC_HAVE_LUA5_3_LUA_H
--#include <lua5.3/lua.h>
--#include <lua5.3/lualib.h>
--#include <lua5.3/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA5_2_LUA_H
--#include <lua5.2/lua.h>
--#include <lua5.2/lualib.h>
--#include <lua5.2/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA5_1_LUA_H
--#include <lua5.1/lua.h>
--#include <lua5.1/lualib.h>
--#include <lua5.1/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA_H
--#include <lua.h>
--#include <lualib.h>
--#include <lauxlib.h>
--#endif
--#endif
--#endif
--#endif
-+#include <@LUA_IMPL@/lua.h>
-+#include <@LUA_IMPL@/lualib.h>
-+#include <@LUA_IMPL@/lauxlib.h>
-
- SC_EXTERN_C_END;
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/
@ 2023-06-21 11:51 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2023-06-21 11:51 UTC (permalink / raw
To: gentoo-commits
commit: 6400ea432d0140e586d7b1c50951d38b3aa3a0d8
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 20 10:47:44 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun 21 11:51:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6400ea43
sci-libs/libsc: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/libsc/files/libsc-9999-set_version.patch | 44 -----------------------
1 file changed, 44 deletions(-)
diff --git a/sci-libs/libsc/files/libsc-9999-set_version.patch b/sci-libs/libsc/files/libsc-9999-set_version.patch
deleted file mode 100644
index 0820b001d8cd..000000000000
--- a/sci-libs/libsc/files/libsc-9999-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 9999.0.0)
-
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/
@ 2023-07-18 10:19 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2023-07-18 10:19 UTC (permalink / raw
To: gentoo-commits
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)
-
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-18 10:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-22 18:59 [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2023-06-21 11:51 Andrew Ammerlaan
2023-07-18 10:19 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox