guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/18: gnu: commencement: gash-boot: Build fix for ARM.


From: guix-commits
Subject: 06/18: gnu: commencement: gash-boot: Build fix for ARM.
Date: Wed, 19 Oct 2022 01:38:49 -0400 (EDT)

janneke pushed a commit to branch wip-aarch64-bootstrap
in repository guix.

commit 34256c83401171a9c9bb2abf6460de6445b6edab
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Dec 16 11:50:22 2021 +0100

    gnu: commencement: gash-boot: Build fix for ARM.
    
    * gnu/packages/commencement.scm (gash-boot)[arguments]: Add 'patch-compat
    stage.
---
 gnu/packages/commencement.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 29e081b6d8..e0aaa0388d 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -157,6 +157,19 @@ pure Scheme to Tar and decompression in one easy step.")
            (replace 'configure
              (bootstrap-configure "Gash" ,(package-version gash)
                                   '("gash") "scripts"))
+           ;; ARM's %bootstrap-guile (2.0.11) does not have EXIT_SUCCESS.
+           (add-after 'unpack 'patch-compat
+             (lambda* _
+               (substitute* "gash/compat.scm"
+                 (("exact-integer") "avoid-exact-integer-override-in-2.0.11")
+                 (("\\(if-guile-version-below \\(2 0 10\\)")
+"(if-guile-version-below (2 0 10)
+  (begin
+    (define-public (exact-integer? x)
+      (and (integer? x) (exact? x)))))
+
+(if-guile-version-below (2 0 12)
+"))))
            (replace 'build (bootstrap-build '("gash")))
            (replace 'install (bootstrap-install '("gash") "scripts"))
            (add-after 'install 'install-symlinks



reply via email to

[Prev in Thread] Current Thread [Next in Thread]