[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: fixup gnu-make-mesboot0
From: |
guix-commits |
Subject: |
01/07: fixup gnu-make-mesboot0 |
Date: |
Wed, 14 Dec 2022 04:00:37 -0500 (EST) |
efraim pushed a commit to branch wip-aarch64-bootstrap
in repository guix.
commit 5b770480c2a9319dea16f1b1085c9d71b686c6af
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Dec 13 13:04:20 2022 +0200
fixup gnu-make-mesboot0
(%current-system) evaluated too early
---
gnu/packages/commencement.scm | 47 ++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 9a7e818598..9d2e401acb 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -697,28 +697,28 @@ MesCC-Tools), and finally M2-Planet.")
(define gnu-make-mesboot0
;; The initial make
- (let ((triplet (match (%current-system)
- ((or "armhf-linux" "aarch64-linux")
- "arm-linux")
- ((or "i686-linux" "x86_64-linux")
- "i686-linux-gnu"))))
- (package
- (inherit gnu-make)
- (name "make-mesboot0")
- (version "3.80")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/make/make-" version
".tar.gz"))
- (sha256
- (base32
- "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4"))))
- (supported-systems '("armhf-linux" "aarch64-linux"
- "i686-linux" "x86_64-linux"))
- (inputs '())
- (propagated-inputs '())
- (native-inputs `(("tcc" ,tcc-boot0)
- ,@(%boot-gash-inputs)))
- (arguments
+ (package
+ (inherit gnu-make)
+ (name "make-mesboot0")
+ (version "3.80")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/make/make-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4"))))
+ (supported-systems '("armhf-linux" "aarch64-linux"
+ "i686-linux" "x86_64-linux"))
+ (inputs '())
+ (propagated-inputs '())
+ (native-inputs `(("tcc" ,tcc-boot0)
+ ,@(%boot-gash-inputs)))
+ (arguments
+ (let ((triplet (match (%current-system)
+ ((or "armhf-linux" "aarch64-linux")
+ "arm-linux")
+ ((or "i686-linux" "x86_64-linux")
+ "i686-linux-gnu"))))
`(#:implicit-inputs? #f
#:guile ,%bootstrap-guile
#:configure-flags (list "CC=tcc"
@@ -1373,7 +1373,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
(base32
"1rs2f9hmvy3q6zkl15jnlmnpgffm0bhw5ax0h5c7q604wqrip69x"))))
(native-inputs (%boot-mesboot0-inputs))
- (supported-systems '("i686-linux" "x86_64-linux"))
+ (supported-systems '("armhf-linux" "aarch64-linux"
+ "i686-linux" "x86_64-linux"))
(inputs '())
(propagated-inputs '())
(arguments
- branch wip-aarch64-bootstrap updated (37da500343 -> 7966084069), guix-commits, 2022/12/14
- 02/07: fixup binutils-mesboot0, guix-commits, 2022/12/14
- 03/07: fixup gcc-core-mesboot0, guix-commits, 2022/12/14
- 04/07: fixup glibc-mesboot0, guix-commits, 2022/12/14
- 01/07: fixup gnu-make-mesboot0,
guix-commits <=
- 06/07: gnu: binutils-mesboot0: parameterize architecture, guix-commits, 2022/12/14
- 07/07: draft: gcc-core-mesboot1: adjust for aarch64-linux, guix-commits, 2022/12/14
- 05/07: squash gcc-mesboot0, guix-commits, 2022/12/14