From 52e75b5c62bb986f843a133e2109ca01732ad784 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 27 Jul 2023 15:41:55 +0200 Subject: [PATCH 1/2] gambit: update to 4.9.5. --- srcpkgs/gambit/patches/tests.patch | 14 ++++++++++++++ srcpkgs/gambit/template | 8 ++------ 2 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/gambit/patches/tests.patch diff --git a/srcpkgs/gambit/patches/tests.patch b/srcpkgs/gambit/patches/tests.patch new file mode 100644 index 0000000000000..c74b293240bc4 --- /dev/null +++ b/srcpkgs/gambit/patches/tests.patch @@ -0,0 +1,14 @@ +Some unit-tests expect an installed version of Gambit, redirect to the +local source. + +--- a/tests/run-unit-tests.scm ++++ b/tests/run-unit-tests.scm +@@ -184,7 +184,7 @@ + + (case target + ((C) +- (run "../gsi/gsi" "-:debug-settings=-,io-settings=lu,~~=.." "-f" file)) ++ (run "../gsi/gsi" "-:debug-settings=-,io-settings=lu,~~=..,~~lib=../lib" "-f" file)) + (else + (let ((gsi (string-append "../gsi/gsi-" (symbol->string target)))) + (run gsi "-f" file)))))) diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template index 27fbcbf793e6d..200f1d560f8a2 100644 --- a/srcpkgs/gambit/template +++ b/srcpkgs/gambit/template @@ -1,6 +1,6 @@ # Template file for 'gambit' pkgname=gambit -version=4.9.4 +version=4.9.5 revision=1 build_style=gnu-configure # We only build core, since the rest doesn't cross-compile. @@ -16,16 +16,12 @@ maintainer="Leah Neukirchen " license="LGPL-2.1-only, Apache-2.0" homepage="https://gambitscheme.org/" distfiles="https://github.com/gambit/gambit/archive/v${version}.tar.gz" -checksum=19fb44a65b669234f6c0467cdc3dbe2e2c95a442f38e4638e7d89c90e247bd08 +checksum=758da7b4afe6411e9c4fed14b0cc5ada39b5f1393c1edd4d3dd9c9a06127c310 case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-DNETDB_INTERNAL=-1 -DNETDB_SUCCESS=0";; esac -post_patch() { - vsed -i 's/4\.9\.3/4.9.4/g' include/stamp-release.h -} - post_install() { for f in ${DESTDIR}/usr/lib/gambit/lib*.so.*; do ln -sfr $f ${DESTDIR}/usr/lib From 2e89ace6e6d43553c93003c4839e654c99daa9d4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 27 Jul 2023 15:42:29 +0200 Subject: [PATCH 2/2] gerbil: rebuild for gambit-4.9.5, enable tests. --- srcpkgs/gerbil/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template index 50f63094019e6..791d80d7e89c6 100644 --- a/srcpkgs/gerbil/template +++ b/srcpkgs/gerbil/template @@ -1,7 +1,7 @@ # Template file for 'gerbil' pkgname=gerbil version=0.17 -revision=1 +revision=2 build_style="gnu-configure" hostmakedepends="gambit rsync" makedepends="openssl-devel sqlite-devel zlib-devel" @@ -17,6 +17,7 @@ do_build() { export GERBIL_GSC=gambit-gsc ( cd src && ./build.sh ) } + do_install() { vmkdir usr/bin vmkdir usr/lib/gerbil @@ -26,3 +27,8 @@ do_install() { vinstall etc/gerbil-mode.el 0644 usr/share/emacs/site-lisp find ${DESTDIR} -name .keep -delete } + +do_check() { + GERBIL_GSC=gambit-gsc GERBIL_HOME=$PWD PATH=$PWD/bin:$PATH \ + ./src/std/run-tests.ss +}