commit: 63aade48ce1eab3facd2da194df1112516be3f5f Author: François Bissey <frp.bissey <AT> gmail <DOT> com> AuthorDate: Wed Apr 6 22:21:21 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Apr 22 00:50:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63aade48
sci-mathematics/singular: added upstream fixes for #776643 and #830279 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: François René Pierre Bissey <frp.bissey <AT> gmail.com> Bug: https://bugs.gentoo.org/776643 Bug: https://bugs.gentoo.org/830279 Closes: https://github.com/gentoo/gentoo/pull/24888 Signed-off-by: Sam James <sam <AT> gentoo.org> .../singular/files/singular-4.3.0-includes.patch | 29 +++++++++++++++++++ .../singular/files/singular-4.3.0-slibtool.patch | 33 ++++++++++++++++++++++ sci-mathematics/singular/singular-4.3.0.ebuild | 2 ++ 3 files changed, 64 insertions(+) diff --git a/sci-mathematics/singular/files/singular-4.3.0-includes.patch b/sci-mathematics/singular/files/singular-4.3.0-includes.patch new file mode 100644 index 000000000000..07df5c0cc068 --- /dev/null +++ b/sci-mathematics/singular/files/singular-4.3.0-includes.patch @@ -0,0 +1,29 @@ +From bbc293564bf76fcdfdc37354d406b7ca77bc780f Mon Sep 17 00:00:00 2001 +From: Hans Schoenemann <[email protected]> +Date: Wed, 19 Jan 2022 15:02:14 +0100 +Subject: [PATCH] fix: missing includes + +--- + kernel/oswrapper/feread.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/kernel/oswrapper/feread.cc b/kernel/oswrapper/feread.cc +index ccdd272285..5491007478 100644 +--- a/kernel/oswrapper/feread.cc ++++ b/kernel/oswrapper/feread.cc +@@ -7,6 +7,7 @@ + + #include "kernel/mod2.h" + #include <errno.h> ++#include <stdio.h> + + // ---------------------------------------- + // system settings: +@@ -21,6 +22,7 @@ + #include "misc/options.h" + + #include "kernel/oswrapper/feread.h" ++#include "reporter/reporter.h" + + #if defined(HAVE_DYN_RL) + #include <unistd.h> diff --git a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch new file mode 100644 index 000000000000..72d88979e870 --- /dev/null +++ b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch @@ -0,0 +1,33 @@ +diff --git a/libpolys/configure.ac b/libpolys/configure.ac +index ba7d911..346602f 100644 +--- a/libpolys/configure.ac ++++ b/libpolys/configure.ac +@@ -88,6 +88,7 @@ AC_CANONICAL_HOST + + case $host_os in + *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);; ++ *) AX_APPEND_LINK_FLAGS([-shared -dynamic -export-dynamic -avoid-version -flat_namespace],[P_PROCS_MODULE_LDFLAGS]);; + esac + + dnl INCLUDES="" +diff --git a/libpolys/polys/Makefile.am b/libpolys/polys/Makefile.am +index 23f216e..119c4ef 100644 +--- a/libpolys/polys/Makefile.am ++++ b/libpolys/polys/Makefile.am +@@ -69,12 +69,10 @@ p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON} + p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON} + p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON} + +-P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -flat_namespace +- +-p_Procs_FieldGeneral_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS} +-p_Procs_FieldIndep_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS} +-p_Procs_FieldQ_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS} +-p_Procs_FieldZp_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS} ++p_Procs_FieldGeneral_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS} ++p_Procs_FieldIndep_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS} ++p_Procs_FieldQ_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS} ++p_Procs_FieldZp_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS} + + P_PROCS = templates/p_Procs_Lib.cc + diff --git a/sci-mathematics/singular/singular-4.3.0.ebuild b/sci-mathematics/singular/singular-4.3.0.ebuild index 96747b1accfb..e2ccc7d6e9a3 100644 --- a/sci-mathematics/singular/singular-4.3.0.ebuild +++ b/sci-mathematics/singular/singular-4.3.0.ebuild @@ -37,6 +37,8 @@ SITEFILE=60${PN}-gentoo.el PATCHES=( "${FILESDIR}/${PN}-4.2.1-htmldoc.patch" + "${FILESDIR}/${PN}-4.3.0-slibtool.patch" + "${FILESDIR}/${PN}-4.3.0-includes.patch" ) src_prepare() {
