From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gambit: update to 4.9.5.
Date: Thu, 27 Jul 2023 17:00:01 +0200 [thread overview]
Message-ID: <20230727150001.BkcWETRPC_gVYEEoE8FRUgSJzuTyNiFKG6hjZC-JzxI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45281@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages gambit495
https://github.com/void-linux/void-packages/pull/45281
gambit: update to 4.9.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/45281.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gambit495-45281.patch --]
[-- Type: text/x-diff, Size: 3228 bytes --]
From 52e75b5c62bb986f843a133e2109ca01732ad784 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
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 <leah@vuxu.org>"
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 <leah@vuxu.org>
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
+}
next prev parent reply other threads:[~2023-07-27 15:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-27 13:44 [PR PATCH] " leahneukirchen
2023-07-27 15:00 ` leahneukirchen [this message]
2023-07-28 7:28 ` [PR PATCH] [Updated] " leahneukirchen
2023-07-28 15:18 ` leahneukirchen
2023-07-28 15:18 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230727150001.BkcWETRPC_gVYEEoE8FRUgSJzuTyNiFKG6hjZC-JzxI@z \
--to=leahneukirchen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).