From 261589a7dc2fd03bdcb8b3e858030cc98e1f0355 Mon Sep 17 00:00:00 2001 From: juanfra Date: Tue, 20 Jan 2026 22:53:44 +0000 Subject: [PATCH] Update to gambit 4.9.7. --- lang/gambit/Makefile | 7 +-- lang/gambit/distinfo | 4 +- lang/gambit/patches/patch-configure | 2 +- lang/gambit/patches/patch-include_gambit_h_in | 6 +-- lang/gambit/pkg/PLIST | 45 ++++++++++++++++++- 5 files changed, 54 insertions(+), 10 deletions(-) diff --git a/lang/gambit/Makefile b/lang/gambit/Makefile index 034f44c7df9..ef402dab92d 100644 --- a/lang/gambit/Makefile +++ b/lang/gambit/Makefile @@ -2,8 +2,7 @@ BROKEN-riscv64= gsi and gsi-script segfault at startup COMMENT= complete, efficient and reliable implementation of Scheme -V= 4.9.5 -REVISION= 0 +V= 4.9.7 DISTNAME= gambit-v${V:S/./_/g} PKGNAME= gambit-$V API_V= ${V:R:S/./0/}00${V:E} @@ -26,6 +25,7 @@ WANTLIB += c crypto m ssl util COMPILER= base-clang ports-gcc COMPILER_LANGS= c +# gambit 4.9.7 doesn't build on amd64 without --enable-trust-c-tco CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--disable-cplusplus \ --disable-absolute-shared-libs \ @@ -34,7 +34,8 @@ CONFIGURE_ARGS+=--disable-cplusplus \ --libdir=${PREFIX}/lib/gambit/ \ --enable-c-opt="${CFLAGS}" \ --enable-openssl \ - --enable-poll + --enable-poll \ + --enable-trust-c-tco CONFIGURE_ENV= CC=${CC} CXX=${CXX} CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" diff --git a/lang/gambit/distinfo b/lang/gambit/distinfo index bb1b09e70c8..24eeea82494 100644 --- a/lang/gambit/distinfo +++ b/lang/gambit/distinfo @@ -1,2 +1,2 @@ -SHA256 (gambit-v4_9_5.tgz) = 4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw= -SIZE (gambit-v4_9_5.tgz) = 16613205 +SHA256 (gambit-v4_9_7.tgz) = UkPT1cw6gucYYBaAsS9IJZTSkUsaiSuKTIASu500PCI= +SIZE (gambit-v4_9_7.tgz) = 16716857 diff --git a/lang/gambit/patches/patch-configure b/lang/gambit/patches/patch-configure index 3f4caa664bf..a3569da32be 100644 --- a/lang/gambit/patches/patch-configure +++ b/lang/gambit/patches/patch-configure @@ -3,7 +3,7 @@ FLAGS_OPT_RTS doesn't honor the CFLAGS. Index: configure --- configure.orig +++ configure -@@ -15371,7 +15371,7 @@ if test "$C_COMP_VISUALC" = yes; then +@@ -15610,7 +15610,7 @@ if test "$C_COMP_VISUALC" = yes; then else diff --git a/lang/gambit/patches/patch-include_gambit_h_in b/lang/gambit/patches/patch-include_gambit_h_in index 81dbba4c2a2..9104eebedc7 100644 --- a/lang/gambit/patches/patch-include_gambit_h_in +++ b/lang/gambit/patches/patch-include_gambit_h_in @@ -4,12 +4,12 @@ in clang. https://github.com/gambit/gambit/issues/898 Index: include/gambit.h.in --- include/gambit.h.in.orig +++ include/gambit.h.in -@@ -1625,7 +1625,7 @@ - +@@ -1665,7 +1665,7 @@ #endif + #if defined(___TRUST_C_TCO) -#if __has_attribute(musttail) +#if __has_attribute(musttail) && !defined(__mips__) && !defined(__powerpc__) #define ___PROPER_TAIL_CALL(call) __attribute__((musttail)) return call #else - #if defined(___TRUST_C_TCO) + #define ___PROPER_TAIL_CALL(call) return call diff --git a/lang/gambit/pkg/PLIST b/lang/gambit/pkg/PLIST index e1780120e4c..4206025292d 100644 --- a/lang/gambit/pkg/PLIST +++ b/lang/gambit/pkg/PLIST @@ -25,7 +25,7 @@ bin/six-script include/gambit/ include/gambit/gambit-not${API_V}.h include/gambit/gambit.h -@info info/gambit.info +info/gambit.info lib/gambit/ lib/gambit/_arm#.scm lib/gambit/_asm#.scm @@ -43,6 +43,18 @@ lib/gambit/_base64/_base64@gambit${API_V}@js/_base64.o1 lib/gambit/_base64/test/ lib/gambit/_base64/test/test.scm lib/gambit/_codegen#.scm +lib/gambit/_csv/ +lib/gambit/_csv/_csv#.scm +lib/gambit/_csv/_csv.scm +lib/gambit/_csv/_csv.sld +lib/gambit/_csv/_csv@gambit${API_V}@C/ +lib/gambit/_csv/_csv@gambit${API_V}@C/_csv.c +@bin lib/gambit/_csv/_csv@gambit${API_V}@C/_csv.o1 +lib/gambit/_csv/_csv@gambit${API_V}@js/ +lib/gambit/_csv/_csv@gambit${API_V}@js/_csv.js +lib/gambit/_csv/_csv@gambit${API_V}@js/_csv.o1 +lib/gambit/_csv/test/ +lib/gambit/_csv/test/test.scm lib/gambit/_define-library/ lib/gambit/_define-library/_define-library#.scm lib/gambit/_define-library/_define-library.scm @@ -138,6 +150,36 @@ lib/gambit/_http/_http@gambit${API_V}@js/_http.o1 lib/gambit/_http/test/ lib/gambit/_http/test/test.scm lib/gambit/_io#.scm +lib/gambit/_irregex/ +lib/gambit/_irregex/_irregex#.scm +lib/gambit/_irregex/_irregex.scm +lib/gambit/_irregex/_irregex.sld +lib/gambit/_irregex/_irregex@gambit${API_V}@C/ +lib/gambit/_irregex/_irregex@gambit${API_V}@C/_irregex.c +@bin lib/gambit/_irregex/_irregex@gambit${API_V}@C/_irregex.o1 +lib/gambit/_irregex/_irregex@gambit${API_V}@js/ +lib/gambit/_irregex/_irregex@gambit${API_V}@js/_irregex.js +lib/gambit/_irregex/_irregex@gambit${API_V}@js/_irregex.o1 +lib/gambit/_irregex/irregex.scm +lib/gambit/_irregex/test/ +lib/gambit/_irregex/test/irregex-utils.scm +lib/gambit/_irregex/test/test-irregex-from-gauche.scm +lib/gambit/_irregex/test/test-irregex-pcre.scm +lib/gambit/_irregex/test/test-irregex-scsh.scm +lib/gambit/_irregex/test/test-irregex-utf8.scm +lib/gambit/_irregex/test/test.scm +lib/gambit/_json/ +lib/gambit/_json/_json#.scm +lib/gambit/_json/_json.scm +lib/gambit/_json/_json.sld +lib/gambit/_json/_json@gambit${API_V}@C/ +lib/gambit/_json/_json@gambit${API_V}@C/_json.c +@bin lib/gambit/_json/_json@gambit${API_V}@C/_json.o1 +lib/gambit/_json/_json@gambit${API_V}@js/ +lib/gambit/_json/_json@gambit${API_V}@js/_json.js +lib/gambit/_json/_json@gambit${API_V}@js/_json.o1 +lib/gambit/_json/test/ +lib/gambit/_json/test/test.scm lib/gambit/_kernel#.scm lib/gambit/_match/ lib/gambit/_match/_match#.scm @@ -369,6 +411,7 @@ lib/gambit/gambit/prim/bytevector@gambit${API_V}@js/ lib/gambit/gambit/prim/bytevector@gambit${API_V}@js/bytevector.js lib/gambit/gambit/prim/bytevector@gambit${API_V}@js/bytevector.o1 lib/gambit/gambit/prim/char#.scm +lib/gambit/gambit/prim/char-gambit#.scm lib/gambit/gambit/prim/char-r4rs#.scm lib/gambit/gambit/prim/char-r7rs#.scm lib/gambit/gambit/prim/char.sld