From patchwork Sun Mar 24 01:18:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Skylar Hill X-Patchwork-Id: 62208 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C934E27BBE2; Sun, 24 Mar 2024 01:22:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F218027BBE9 for ; Sun, 24 Mar 2024 01:22:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roCZ5-0006nP-Qu; Sat, 23 Mar 2024 21:22:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1roCZ4-0006mz-7v for guix-patches@gnu.org; Sat, 23 Mar 2024 21:22:22 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1roCZ3-0000uz-Fe for guix-patches@gnu.org; Sat, 23 Mar 2024 21:22:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roCZi-0006al-5K for guix-patches@gnu.org; Sat, 23 Mar 2024 21:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69970] [PATCH] gnu: gerbil: Update to 0.18.1. Resent-From: Skylar Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Mar 2024 01:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69970 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69970@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171124334225260 (code B ref -1); Sun, 24 Mar 2024 01:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Mar 2024 01:22:22 +0000 Received: from localhost ([127.0.0.1]:39234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roCZ4-0006ZM-0H for submit@debbugs.gnu.org; Sat, 23 Mar 2024 21:22:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:60818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roCZ1-0006ZD-8g for submit@debbugs.gnu.org; Sat, 23 Mar 2024 21:22:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1roCYL-0006jJ-CS for guix-patches@gnu.org; Sat, 23 Mar 2024 21:21:37 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1roCYI-0000qQ-8O for guix-patches@gnu.org; Sat, 23 Mar 2024 21:21:37 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 02F4B240027 for ; Sun, 24 Mar 2024 02:21:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711243290; bh=b8EQqBqrZyIFIPmeOn7KGRwf5nsemp+Pauc7RYn22Io=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Disposition:Content-Transfer-Encoding:From; b=UTl7a5cH/2i4I+CU5y5TXEmXby18ZA9IRPtMdKlklUeJ5fuk+fRS2dBrkx5JW6XO0 +qWwQhvjK6w/RCyyAWqOnPOW1BsqA7CY8QacFQjcT9Jc/+TSs7U0DTNaARfEZEUFvF yLeTFUwWv/eLuA/YZD/7RigaHJJPcpnK/4pzbLJF5RiP4ZSIj2gye4d0uliT6dLTtm c+ytIkl6HWrqzAhUEWkbIgLYAkTbaTP5HsROlTx/F57CkFCkuWPivSPaZJ0OVl9lRG 6XIPqLzaKktW+Wcg8dmnKlc6XUXnrHJgegxiJAc0RP2IB4rgb2h40/NxIj5vNbjfBJ 3TAxksLVZercg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V2JDn0QRHz6tmv for ; Sun, 24 Mar 2024 02:21:28 +0100 (CET) From: Skylar Hill Date: Sun, 24 Mar 2024 01:18:27 +0000 Message-ID: <87r0g0whk8.fsf@posteo.net> MIME-Version: 1.0 Content-Disposition: inline; filename=0001-gnu-gerbil-Update-to-0.18.1.patch Received-SPF: pass client-ip=185.67.36.65; envelope-from=stellarskylark@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 0fd3c8a884393951a4d73ca54aaad278e5c4495f Mon Sep 17 00:00:00 2001 Message-ID: <0fd3c8a884393951a4d73ca54aaad278e5c4495f.1711243058.git.stellarskylark@posteo.net> From: Skylar Hill 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 ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2024 Skylar Hill ;;; ;;; 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