[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/, sci-libs/libsc/files/
commit: ca942b500cd74be4ef39a90a282d6ba6870826a0 Author: Matthias Maier gentoo org> AuthorDate: Mon Jun 19 17:33:43 2023 + Commit: Matthias Maier gentoo org> CommitDate: Mon Jun 19 18:26:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca942b50 sci-libs/libsc: add 2.8.5 Signed-off-by: Matthias Maier gentoo.org> sci-libs/libsc/Manifest| 1 + .../files/libsc-2.8.5-do_not_compile_zlib-ng.patch | 57 + .../libsc/files/libsc-2.8.5-fix_build_system.patch | 25 sci-libs/libsc/files/libsc-2.8.5-set_version.patch | 49 .../files/libsc-2.8.5-use_zlib-ng_symbols.patch| 135 + sci-libs/libsc/libsc-2.8.5.ebuild | 69 +++ 6 files changed, 336 insertions(+) diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index d14ff4ef580d..af1e9c81cb76 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1 +1,2 @@ DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de +DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b diff --git a/sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch b/sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch new file mode 100644 index ..fb0ce0de7dbb --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch @@ -0,0 +1,57 @@ +diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake +index 5ca9f6d..86b9035 100644 +--- a/cmake/zlib.cmake b/cmake/zlib.cmake +@@ -1,51 +1,8 @@ + # build Zlib to ensure compatibility. + # We use Zlib 2.x for speed and robustness. + include(GNUInstallDirs) +-include(ExternalProject) + +-set(ZLIB_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include) +- +-if(BUILD_SHARED_LIBS) +- if(WIN32) +-set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}zlib1${CMAKE_SHARED_LIBRARY_SUFFIX}) +- else() +-set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX}) +- endif() +-else() +- if(MSVC) +-set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}zlibstatic${CMAKE_STATIC_LIBRARY_SUFFIX}) +- else() +-set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}z${CMAKE_STATIC_LIBRARY_SUFFIX}) +- endif() +-endif() +- +-set(zlib_cmake_args +--DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} +--DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} +--DCMAKE_BUILD_TYPE=Release +--DZLIB_COMPAT:BOOL=on +--DZLIB_ENABLE_TESTS:BOOL=off +--DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON +--DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} +-) +- +-ExternalProject_Add(ZLIB +-GIT_REPOSITORY https://github.com/zlib-ng/zlib-ng.git +-GIT_TAG 2.0.6 +-GIT_SHALLOW true +-CMAKE_ARGS ${zlib_cmake_args} +-BUILD_BYPRODUCTS ${ZLIB_LIBRARIES} +-TLS_VERIFY true +-CONFIGURE_HANDLED_BY_BUILD ON +-INACTIVITY_TIMEOUT 60 +-) +- +-# --- imported target +- +-file(MAKE_DIRECTORY ${ZLIB_INCLUDE_DIRS}) +-# avoid race condition ++find_library(ZLIB_LIBRARIES NAMES z-ng) + + add_library(ZLIB::ZLIB INTERFACE IMPORTED GLOBAL) +-add_dependencies(ZLIB::ZLIB ZLIB) # to avoid include directory race condition + target_link_libraries(ZLIB::ZLIB INTERFACE ${ZLIB_LIBRARIES}) +-target_include_directories(ZLIB::ZLIB INTERFACE ${ZLIB_INCLUDE_DIRS}) diff --git a/sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch new file mode 100644 index ..6adfbf31c997 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 87af1b1..82cb357 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) ++ + enable_testing() + + include(cmake/options.cmake) +@@ -57,7 +59,10 @@ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h" + ) + +-install(TARGETS sc EXPORT ${PROJECT_NAME}-targets) ++install(TARGETS sc EXPORT ${PROJECT_NAME}-targets ++ARCHIVE DESTINATION ${library_reldir} ++LIBRARY DESTINATION ${library_reldir} ++) + + add_subdirectory(src) + add_subdirectory(example) diff --git a/sci-libs/libsc/files/libsc-2.8.5-set_version.patch b/sci-libs/libsc/files/libsc-2.8.5-set_version.patch new file mode 100644 index ..061081a0da9e
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/, sci-libs/libsc/files/
commit: 406d3fc821c6be208814445bc2ad98bed3c2e9b4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 28 15:54:11 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 1 19:26:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406d3fc8 sci-libs/libsc: drop 2.3.1-r1, 2.3.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/libsc/Manifest| 2 - sci-libs/libsc/files/libsc-2.3-add_soname.patch| 13 --- .../files/libsc-2.3-autoconf_lua_version.patch | 64 - sci-libs/libsc/libsc-2.3.1-r1.ebuild | 100 - sci-libs/libsc/libsc-2.3.3.ebuild | 100 - sci-libs/libsc/metadata.xml| 3 - 6 files changed, 282 deletions(-) diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index 05ef5652e9e8..d14ff4ef580d 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1,3 +1 @@ -DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a -DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a SHA512 b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de diff --git a/sci-libs/libsc/files/libsc-2.3-add_soname.patch b/sci-libs/libsc/files/libsc-2.3-add_soname.patch deleted file mode 100644 index 61e8d56fa44d.. --- a/sci-libs/libsc/files/libsc-2.3-add_soname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 9d030d5..decbea8 100644 a/src/Makefile.am -+++ b/src/Makefile.am -@@ -43,7 +43,7 @@ src_libsc_la_SOURCES = \ - $(libsc_internal_headers) \ - $(libsc_compiled_sources) - src_libsc_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS) --## src_libsc_la_LDFLAGS = -release $(VERSION) -+src_libsc_la_LDFLAGS = -release $(VERSION) - LDADD += @top_builddir@/src/libsc.la - - nodist_include_HEADERS += $(libsc_generated_headers) diff --git a/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch deleted file mode 100644 index 9881d0aa6227.. --- a/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/config/sc_include.m4 b/config/sc_include.m4 -index f6f7873..3befe0e 100644 a/config/sc_include.m4 -+++ b/config/sc_include.m4 -@@ -281,8 +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], -- [LUA], [$1]) -+SC_CHECK_LIB([$LUA_IMPL], [lua_createtable], [LUA], [$1]) - SC_CHECK_BLAS_LAPACK([$1]) - SC_BUILTIN_ALL_PREFIX([$1]) - SC_CHECK_PTHREAD([$1]) -diff --git a/configure.ac b/configure.ac -index ce462e0..b291685 100644 a/configure.ac -+++ b/configure.ac -@@ -78,7 +78,7 @@ echo "o---" - AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/select.h sys/stat.h]) - AC_CHECK_HEADERS([linux/videodev2.h]) - 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" -diff --git a/src/sc_lua.h b/src/sc_lua.h -index 770b52f..a6db175 100644 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 --#include --#include --#else --#ifdef SC_HAVE_LUA5_2_LUA_H --#include --#include --#include --#else --#ifdef SC_HAVE_LUA5_1_LUA_H --#include --#include --#include --#else --#ifdef SC_HAVE_LUA_H --#include --#include --#include --#endif --#endif --#endif --#endif -+#include <@LUA_IMPL@/lua.h> -+#include <@LUA_IMPL@/lualib.h> -+#include <@LUA_IMPL@/lauxlib.h> - - SC_EXTERN_C_END; - diff --git a/sci-libs/libsc/libsc-2.3.1-r1.ebuild b/sci-libs/libsc/libsc-2.3.1-r1.ebuild deleted file mode 100644 index 6728d0cadb05.. --- a/sci-libs/libsc/libsc-2.3.1-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/, sci-libs/libsc/files/
commit: cb560121a2ba971e17e1ba9b5bd57baed1e1b41b Author: Matthias Maier gentoo org> AuthorDate: Mon Jun 7 16:23:52 2021 + Commit: Matthias Maier gentoo org> CommitDate: Mon Jun 7 16:41:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb560121 sci-libs/libsc: add soname back Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Matthias Maier gentoo.org> sci-libs/libsc/files/libsc-2.3-add_soname.patch | 13 + sci-libs/libsc/libsc-2.3.1.ebuild | 1 + 2 files changed, 14 insertions(+) diff --git a/sci-libs/libsc/files/libsc-2.3-add_soname.patch b/sci-libs/libsc/files/libsc-2.3-add_soname.patch new file mode 100644 index 000..61e8d56fa44 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.3-add_soname.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 9d030d5..decbea8 100644 +--- a/src/Makefile.am b/src/Makefile.am +@@ -43,7 +43,7 @@ src_libsc_la_SOURCES = \ + $(libsc_internal_headers) \ + $(libsc_compiled_sources) + src_libsc_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS) +-## src_libsc_la_LDFLAGS = -release $(VERSION) ++src_libsc_la_LDFLAGS = -release $(VERSION) + LDADD += @top_builddir@/src/libsc.la + + nodist_include_HEADERS += $(libsc_generated_headers) diff --git a/sci-libs/libsc/libsc-2.3.1.ebuild b/sci-libs/libsc/libsc-2.3.1.ebuild index 7033e904a98..e84c20273cf 100644 --- a/sci-libs/libsc/libsc-2.3.1.ebuild +++ b/sci-libs/libsc/libsc-2.3.1.ebuild @@ -39,6 +39,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch + "${FILESDIR}"/${PN}-2.3-add_soname.patch ) DOCS=( AUTHORS NEWS README )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/, sci-libs/libsc/files/, profiles/
commit: 778bcc52e751edb3d000ff58fe08c73eaa2a854e Author: Marek Szuba gentoo org> AuthorDate: Sun Dec 20 13:05:42 2020 + Commit: Marek Szuba gentoo org> CommitDate: Sun Dec 20 13:28:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778bcc52 sci-libs/libsc: migrate to lua-single.eclass Both the latest release and the live ebuild. Compatibility as per upstream build scripts. Uses a weird home-grown way of detecting Lua which makes implicit assumptions about paths used by Lua headers, I think I've managed to figure it out though. Status: - 2.2-r100 builds and installs fine but has one test (dmatrix) failing with a non-zero exit code, which test however has got nothing to do with Lua; - fails to build on an unrelated matter (upstream version-processing macros do not like "" appearing as version number). Closes: https://bugs.gentoo.org/752840 Signed-off-by: Marek Szuba gentoo.org> profiles/package.mask | 1 + .../files/libsc-2.2-autoconf_lua_version.patch | 51 +++ .../libsc-_20201220-autoconf_lua_version.patch | 57 ++ .../{libsc-.ebuild => libsc-2.2-r100.ebuild} | 24 ++--- sci-libs/libsc/libsc-.ebuild | 24 ++--- 5 files changed, 141 insertions(+), 16 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 806827bc3a1..c7ee6fe1f40 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -529,6 +529,7 @@ kde-apps/kdebase-meta:5 >=net-im/swift-4.0.2-r100 >=net-p2p/eiskaltdcpp-2.2.10-r100 >=sci-astronomy/celestia-1.7.0_pre20200316-r100 +>=sci-libs/libsc-2.2-r100 >=sci-libs/plplot-5.15.0-r100 =sci-visualization/gnuplot-5.4.0-r100 =sci-visualization/gnuplot-5.4.1-r1 diff --git a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch new file mode 100644 index 000..c2cbdb1b003 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch @@ -0,0 +1,51 @@ +--- 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([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,23 +30,9 @@ + + SC_EXTERN_C_BEGIN; + +-#ifdef SC_HAVE_LUA5_2_LUA_H +-#include +-#include +-#include +-#else +-#ifdef SC_HAVE_LUA5_1_LUA_H +-#include +-#include +-#include +-#else +-#ifdef SC_HAVE_LUA_H +-#include +-#include +-#include +-#endif +-#endif +-#endif ++#include <@LUA_IMPL@/lua.h> ++#include <@LUA_IMPL@/lualib.h> ++#include <@LUA_IMPL@/lauxlib.h> + + SC_EXTERN_C_END; + diff --git a/sci-libs/libsc/files/libsc-_20201220-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-_20201220-autoconf_lua_version.patch new file mode 100644 index 000..c138bb3fc4b --- /dev/null +++ b/sci-libs/libsc/files/libsc-_20201220-autoconf_lua_version.patch @@ -0,0 +1,57 @@ +--- 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 +-#include +-#include +-#else +-#ifdef SC_HAVE_LUA5_2_LUA_H +-#include +-#include +-#include +-#else +-#ifdef SC_HAVE_LUA5_1_LUA_H +-#include +-#include +-#include +-#else +-#ifdef SC_HAVE_LUA_H +-#include +-#include +-#include +-#endif +-#endif +-#endif +-#endif ++#include <@LUA_IMPL@/lua.h> ++#include <@LUA_IMPL@/lualib.h> ++#include <@LUA_IMPL@/lauxlib.h> + + SC_EXTERN_C_END; + diff --git