diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2023-07-14 20:23:44 -0500 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2023-07-14 21:15:12 -0500 |
| commit | deade5ff52628efc8005c16ca711917bf8565f99 (patch) | |
| tree | e9d2de22661eb01bc30c413fc99712a1a3e964a9 /sci-libs/libsc/files | |
| parent | app-benchmarks/stress-ng: add 0.16.02, drop 0.16.01 (diff) | |
| download | gentoo-deade5ff52628efc8005c16ca711917bf8565f99.tar.gz gentoo-deade5ff52628efc8005c16ca711917bf8565f99.tar.bz2 gentoo-deade5ff52628efc8005c16ca711917bf8565f99.zip | |
sci-libs/libsc: add 2.3.6
This partially reverts commit 406d3fc821c6be208814445bc2ad98bed3c2e9b4
and bumps 2.3.3 to 2.3.6.
In turns out that libsc/p4est-2.8.5 has a massive performance regression
which necessitates to use the "stable" version 2.3.6. Thus, bring it
back into the tree
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'sci-libs/libsc/files')
| -rw-r--r-- | sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch | 64 | ||||
| -rw-r--r-- | sci-libs/libsc/files/libsc-2.3.6-override_soname.patch | 13 |
2 files changed, 77 insertions, 0 deletions
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 new file mode 100644 index 000000000000..9881d0aa6227 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch @@ -0,0 +1,64 @@ +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 <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; + diff --git a/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch b/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch new file mode 100644 index 000000000000..54a45294c380 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 914237c..0bf982a 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -45,7 +45,7 @@ src_libsc_la_SOURCES = \ + src_libsc_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS) + ## This is the official API versioning scheme of libtool. Please see: + ## Read https://www.gnu.org/software/libtool/manual/libtool.html#Versioning +-src_libsc_la_LDFLAGS = -version-info 1:0:0 ++src_libsc_la_LDFLAGS = -release $(VERSION) + LDADD += src/libsc.la + + nodist_include_HEADERS += $(libsc_generated_headers) |