guix-commits
[Top][All Lists]
Advanced

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

09/26: commencement: gash-boot: Build fix for ARM.


From: guix-commits
Subject: 09/26: commencement: gash-boot: Build fix for ARM.
Date: Sat, 9 Jan 2021 13:30:47 -0500 (EST)

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

commit f05a1389290d50ed96431ceae13db7157fa1e843
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Dec 16 11:50:22 2020 +0100

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

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 432910d..272e666 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -154,6 +154,20 @@ pure Scheme to Tar and decompression in one easy step.")
          (modify-phases %standard-phases
            (replace 'configure
              (bootstrap-configure ,(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)
+"))
+               #t))
            (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]