[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/, dev-scheme/guile/files/

[Sam James]

commit:     fb97c7de4b112b77e5205b7926bfaf1d38cc733d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 05:52:29 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 05:52:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb97c7de

dev-scheme/guile: fix build where stack grows upwards

Closes: https://bugs.gentoo.org/747049
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-scheme/guile/files/guile-2.2.7-stack-up.patch | 17 +++++++++++++++++
 dev-scheme/guile/guile-2.2.7.ebuild               |  8 ++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dev-scheme/guile/files/guile-2.2.7-stack-up.patch b/dev-scheme/guile/files/guile-2.2.7-stack-up.patch
new file mode 100644
index 00000000000..de291421c0b
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.2.7-stack-up.patch
@@ -0,0 +1,17 @@
+This patch (dropping an obsolete extra parameter to grow_stack) landed post
+2.2.7 and we're not likely to ever see a 2.2.8, as development has moved
+on to 3.x now.
+
+https://bugs.gentoo.org/747049
+https://www.mail-archive.com/guile-devel@×××.org/msg15502.html
+--- a/libguile/continuations.c
++++ b/libguile/continuations.c
+@@ -302,7 +302,7 @@
+ 
+ #if SCM_STACK_GROWS_UP
+   if (dst + continuation->num_stack_items >= &stack_top_element)
+-    grow_stack (cont, mra);
++    grow_stack (cont);
+ #else
+   dst -= continuation->num_stack_items;
+   if (dst <= &stack_top_element)

diff --git a/dev-scheme/guile/guile-2.2.7.ebuild b/dev-scheme/guile/guile-2.2.7.ebuild
index 61026da9a02..6020cc99568 100644
--- a/dev-scheme/guile/guile-2.2.7.ebuild
+++ b/dev-scheme/guile/guile-2.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,11 @@ BDEPEND="
 	sys-devel/libtool
 	sys-devel/gettext"
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
+	"${FILESDIR}/${PN}-2.2.7-stack-up.patch"
+)
+
 DOCS=( GUILE-VERSION HACKING README )
 
 src_configure() {