From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5BC3A15808D for ; Fri, 22 Apr 2022 00:50:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D83AE08FB; Fri, 22 Apr 2022 00:50:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91F27E08FB for ; Fri, 22 Apr 2022 00:50:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32464341E27 for ; Fri, 22 Apr 2022 00:50:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89D733B0 for ; Fri, 22 Apr 2022 00:50:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650588601.63aade48ce1eab3facd2da194df1112516be3f5f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/singular/files/singular-4.3.0-includes.patch sci-mathematics/singular/files/singular-4.3.0-slibtool.patch sci-mathematics/singular/singular-4.3.0.ebuild X-VCS-Directories: sci-mathematics/singular/files/ sci-mathematics/singular/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 63aade48ce1eab3facd2da194df1112516be3f5f X-VCS-Branch: master Date: Fri, 22 Apr 2022 00:50:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 76f36db7-a900-424b-a8b1-455df28a086e X-Archives-Hash: 0bdedb1c3dc5e23e11da21ba6d33595c commit: 63aade48ce1eab3facd2da194df1112516be3f5f Author: François Bissey gmail com> AuthorDate: Wed Apr 6 22:21:21 2022 +0000 Commit: Sam James gentoo 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 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 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 +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 ++#include + + // ---------------------------------------- + // 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 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() {