* [bug#69970] [PATCH] gnu: gerbil: Update to 0.18.1.
@ 2024-03-24 1:18 Skylar Hill
2024-03-29 23:58 ` bug#69970: " Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Skylar Hill @ 2024-03-24 1:18 UTC (permalink / raw)
To: 69970
[-- Attachment #1: 0001-gnu-gerbil-Update-to-0.18.1.patch --]
[-- Type: text/x-patch, Size: 9881 bytes --]
From 0fd3c8a884393951a4d73ca54aaad278e5c4495f Mon Sep 17 00:00:00 2001
Message-ID: <0fd3c8a884393951a4d73ca54aaad278e5c4495f.1711243058.git.stellarskylark@posteo.net>
From: Skylar Hill <stellarskylark@posteo.net>
Date: Sat, 23 Mar 2024 19:50:40 -0500
Subject: [PATCH] gnu: gerbil: Update to 0.18.1.
* gnu/packages/scheme.scm (gerbil): Update to 0.18.1.
Upstream follows the standard autotools build system more closely now, which
simplifies the package definition a lot.
Change-Id: I4248ae3d6df3beaf57b6036f5329374da79e26f1
---
gnu/packages/scheme.scm | 153 +++++++++++++++++-----------------------
1 file changed, 66 insertions(+), 87 deletions(-)
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 5ca1a0d2f8..36f6d84485 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -23,6 +23,7 @@
;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2024 Skylar Hill <stellarskylark@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1117,95 +1118,73 @@ (define-public cl-airship-scheme
(define-public gerbil
(package
(name "gerbil")
- (version "0.17.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/vyzo/gerbil")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0c0nspm659ybgmqlppdv7sxzll4hwkvcp9qmcsip6d0kz0p8r9c3"))))
+ (version "0.18.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/mighty-gerbils/gerbil/releases/download/v"
+ version "/gerbil-v" version ".tar.gz"))
+ (sha256
+ (base32 "1dff14bzqkq6scyyhnwhc3ky96j6lr84mnghk4da0x6vifw7p0p1"))))
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (delete 'bootstrap)
- (add-before 'configure 'chdir
- (lambda _
- (chdir "src")))
- (replace 'configure
- (lambda _
- (invoke "chmod" "755" "-R" ".")
- ;; Otherwise fails when editing an r--r--r-- file.
- (invoke "gsi-script"
- "configure"
- "--prefix"
- #$output
- "--with-gambit"
- #$gambit-c)))
- (add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs
- (lambda _
- ;; Some .ss files refer to gxi using /usr/bin/env gxi
- ;; and 'patch-generated-file-shebangs can't fix that
- ;; because gxi has not been compiled yet.
- ;; We know where gxi is going to end up so we
- ;; Doctor Who our fix here before the problem
- ;; happens towards the end of the build.sh script.
- (let ((abs-srcdir (getcwd)))
- (for-each (lambda (f)
- (substitute* f
- (("#!/usr/bin/env gxi")
- (string-append "#!" abs-srcdir
- "/../bin/gxi"))))
- '("./gerbil/gxc" "./lang/build.ss"
- "./misc/http-perf/build.ss"
- "./misc/rpc-perf/build.ss"
- "./misc/scripts/docsnarf.ss"
- "./misc/scripts/docstub.ss"
- "./misc/scripts/docsyms.ss"
- "./r7rs-large/build.ss"
- "./release.ss"
- "./std/build.ss"
- "./std/run-tests.ss"
- "./std/web/fastcgi-test.ss"
- "./std/web/rack-test.ss"
- "./tools/build.ss"
- "./tutorial/httpd/build.ss"
- "./tutorial/kvstore/build.ss"
- "./tutorial/lang/build.ss"
- "./tutorial/proxy/build-static.ss"
- "./tutorial/proxy/build.ss")))))
- (add-after 'configure 'create-gx-version.scm
- (lambda _
- (with-output-to-file (string-append (getcwd)
- "/gerbil/runtime/gx-version.scm")
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (delete 'bootstrap)
+ (add-after 'set-paths 'set-cc
+ (lambda _
+ (setenv "CC"
+ (string-append #$gcc "/bin/gcc"))))
+ (add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs
+ (lambda _
+ ;; Some .ss files refer to gxi using /usr/bin/env gxi
+ ;; and 'patch-generated-file-shebangs can't fix that
+ ;; because gxi has not been compiled yet.
+ ;; We know where gxi is going to end up so we
+ ;; Doctor Who our fix here before the problem
+ ;; happens towards the end of the build.sh script.
+ (let ((abs-srcdir (getcwd)))
+ (for-each (lambda (f)
+ (substitute* f
+ (("#!/usr/bin/env gxi")
+ (string-append "#!" abs-srcdir
+ "/../bin/gxi"))))
+ '("./src/std/web/rack-test.ss"
+ "./src/std/web/fastcgi-test.ss"
+ "./src/std/build.ss"
+ "./src/build/build-libgerbil.ss"
+ "./src/gerbil/test/test-build-static-exe.ss"
+ "./src/gerbil/test/test-build-optimized-static-exe.ss"
+ "./src/gerbil/test/test-build-optimized-exe.ss"
+ "./src/gerbil/test/test-build-exe.ss"
+ "./src/srfi/build.ss"
+ "./src/r7rs-large/build.ss"
+ "./src/misc/rpc-perf/build.ss"
+ "./src/misc/http-perf/build.ss"
+ "./src/misc/scripts/docsnarf.ss"
+ "./src/misc/scripts/docstub.ss"
+ "./src/misc/scripts/docsyms.ss"
+ "./src/tools/gxpkg.ss"
+ "./src/tools/build.ss"
+ "./src/lang/build.ss"
+ "./src/tutorial/kvstore/build.ss"
+ "./src/tutorial/httpd/build.ss"
+ "./src/tutorial/proxy/build.ss"
+ "./src/tutorial/ensemble/build.ss"
+ "./src/tutorial/lang/build.ss")))))
+ (replace 'build
(lambda _
- (write `(define (gerbil-version-string)
- ,(string-append "v"
- #$(version-major+minor
- version))))))))
- (replace 'build
- (lambda _
- (setenv "HOME"
- (getcwd))
- (invoke
- ;; The build script needs a tty or it'll crash on an ioctl
- ;; trying to find the width of the terminal it's running on.
- ;; Calling in script prevents that.
- "script"
- "-qefc"
- "./build.sh")))
- (replace 'install
- (lambda _
- (let* ((bin (string-append #$output "/bin"))
- (lib (string-append #$output "/lib")))
- (mkdir-p bin)
- (mkdir-p lib)
- (copy-recursively "../bin" bin)
- (copy-recursively "../lib" lib)))))
- #:tests? #f))
- (native-inputs (list coreutils gambit-c util-linux))
+ (setenv "HOME"
+ (getcwd))
+ (invoke
+ ;; The build script needs a tty or it'll crash on an ioctl
+ ;; trying to find the width of the terminal it's running on.
+ ;; Calling in script prevents that.
+ "script"
+ "-qefc"
+ "./build.sh"))))
+ #:tests? #f))
+ (native-inputs (list coreutils gcc gambit-c util-linux))
(propagated-inputs (list gambit-c openssl sqlite zlib))
(build-system gnu-build-system)
(synopsis "Meta-dialect of Scheme with post-modern features")
base-commit: f6f4c71df5558b168fe7a313522af7ea5fe2d0dc
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#69970: [PATCH] gnu: gerbil: Update to 0.18.1.
2024-03-24 1:18 [bug#69970] [PATCH] gnu: gerbil: Update to 0.18.1 Skylar Hill
@ 2024-03-29 23:58 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2024-03-29 23:58 UTC (permalink / raw)
To: Skylar Hill; +Cc: 69970-done
[-- Attachment #1: Type: text/plain, Size: 710 bytes --]
Hi,
Skylar Hill <stellarskylark@posteo.net> skribis:
>>From 0fd3c8a884393951a4d73ca54aaad278e5c4495f Mon Sep 17 00:00:00 2001
> Message-ID: <0fd3c8a884393951a4d73ca54aaad278e5c4495f.1711243058.git.stellarskylark@posteo.net>
> From: Skylar Hill <stellarskylark@posteo.net>
> Date: Sat, 23 Mar 2024 19:50:40 -0500
> Subject: [PATCH] gnu: gerbil: Update to 0.18.1.
>
> * gnu/packages/scheme.scm (gerbil): Update to 0.18.1.
>
> Upstream follows the standard autotools build system more closely now, which
> simplifies the package definition a lot.
>
> Change-Id: I4248ae3d6df3beaf57b6036f5329374da79e26f1
Applied with the changes below and a more detailed commit log.
Thanks!
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1094 bytes --]
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 36f6d84485..070696d6ba 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -1133,8 +1133,7 @@ (define-public gerbil
(delete 'bootstrap)
(add-after 'set-paths 'set-cc
(lambda _
- (setenv "CC"
- (string-append #$gcc "/bin/gcc"))))
+ (setenv "CC" #$(cc-for-target))))
(add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs
(lambda _
;; Some .ss files refer to gxi using /usr/bin/env gxi
@@ -1184,7 +1183,7 @@ (define-public gerbil
"-qefc"
"./build.sh"))))
#:tests? #f))
- (native-inputs (list coreutils gcc gambit-c util-linux))
+ (native-inputs (list gambit-c util-linux))
(propagated-inputs (list gambit-c openssl sqlite zlib))
(build-system gnu-build-system)
(synopsis "Meta-dialect of Scheme with post-modern features")
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-29 23:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-24 1:18 [bug#69970] [PATCH] gnu: gerbil: Update to 0.18.1 Skylar Hill
2024-03-29 23:58 ` bug#69970: " Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).