[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/20: commencement: gash-boot: Build fix for ARM.
From: |
guix-commits |
Subject: |
09/20: commencement: gash-boot: Build fix for ARM. |
Date: |
Sun, 20 Dec 2020 04:03:16 -0500 (EST) |
janneke pushed a commit to branch wip-arm-bootstrap
in repository guix.
commit 5f0a54c8601960926a0bb5fbc0066bbca5bb48ec
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
- 05/20: bootstrap: mescc-tools: Support ARM, update to 0.7.0., (continued)
- 05/20: bootstrap: mescc-tools: Support ARM, update to 0.7.0., guix-commits, 2020/12/20
- 06/20: bootstrap: mes-minimal: Support ARM, update to mes-0.22.115., guix-commits, 2020/12/20
- 07/20: bootstrap: %bootstrap-mescc-tools: Support ARM., guix-commits, 2020/12/20
- 08/20: bootstrap: %bootstrap-mes: Support ARM., guix-commits, 2020/12/20
- 10/20: commencement: Add bootstrap-mes-rewired-next., guix-commits, 2020/12/20
- 13/20: REMOVEME Use %bootstrap-guile for tcc-boot0-next., guix-commits, 2020/12/20
- 15/20: REMOVEME Use mes-next for tcc-boot0-next., guix-commits, 2020/12/20
- 16/20: REMOVEME: Use coreutils&co, bash instead of gash., guix-commits, 2020/12/20
- 17/20: commencement: Add make-mesboot0-next., guix-commits, 2020/12/20
- 03/20: gnu: mes: Update to nyacc-1.00.2., guix-commits, 2020/12/20
- 09/20: commencement: gash-boot: Build fix for ARM.,
guix-commits <=
- 20/20: Revert "tcc-boot0-next: stop for aarch comparison", guix-commits, 2020/12/20
- 12/20: commencement: Add tcc-boot0-next., guix-commits, 2020/12/20
- 04/20: gnu: Add mes-next., guix-commits, 2020/12/20
- 11/20: commencement: Add mes-boot-next., guix-commits, 2020/12/20
- 14/20: commencement: Add tcc-boot-next., guix-commits, 2020/12/20
- 18/20: tcc-boot0-next: stop for aarch comparison, guix-commits, 2020/12/20
- 19/20: tcc-boot-next, guix-commits, 2020/12/20