[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
169/192: bootstrap: Evaluate %bootstrap-inputs+toolchain at build time.
From: |
Jan Nieuwenhuizen |
Subject: |
169/192: bootstrap: Evaluate %bootstrap-inputs+toolchain at build time. |
Date: |
Mon, 3 Sep 2018 16:25:21 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8fd0e35b504de7cf6d474cfc7c67f4d4fc0d6ab4
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Aug 31 15:29:50 2018 +0200
bootstrap: Evaluate %bootstrap-inputs+toolchain at build time.
Turn '%bootstrap-inputs+toolchain' into a thunk so that (%current-system)
is evaluated at the right time.
---
gnu/packages/commencement.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 3642c00..2cf86ba 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1686,7 +1686,7 @@ exec " gcc "/bin/" program
(system* "./configure"
(string-append "--prefix=" out))))))))))))
-(define %bootstrap-inputs+toolchain
+(define (%bootstrap-inputs+toolchain)
(append (match (%current-system)
("i686-linux" `(;;("libc" ,glibc-mesboot) ; FIXME: make usable for
unpatched gnu-make-boot0, *-boot0
("libc" ,%bootstrap-glibc)
@@ -1719,13 +1719,13 @@ exec " gcc "/bin/" program
(install-file "make" bin)
#t))))))))
(native-inputs '()) ; no need for 'pkg-config'
- (inputs %bootstrap-inputs+toolchain))))
+ (inputs (%bootstrap-inputs+toolchain)))))
(define diffutils-boot0
(package-with-bootstrap-guile
(let ((p (package-with-explicit-inputs diffutils
`(("make" ,gnu-make-boot0)
- ,@%bootstrap-inputs+toolchain)
+ ,@(%bootstrap-inputs+toolchain))
#:guile %bootstrap-guile)))
(package (inherit p)
(name "diffutils-boot0")
@@ -1739,7 +1739,7 @@ exec " gcc "/bin/" program
(name "findutils-boot0"))
`(("make" ,gnu-make-boot0)
("diffutils" ,diffutils-boot0) ; for tests
- ,@%bootstrap-inputs+toolchain)
+ ,@(%bootstrap-inputs+toolchain))
(current-source-location)
#:guile %bootstrap-guile)))
@@ -1747,7 +1747,7 @@ exec " gcc "/bin/" program
(package-with-bootstrap-guile
(let ((p (package-with-explicit-inputs file
`(("make" ,gnu-make-boot0)
- ,@%bootstrap-inputs+toolchain)
+ ,@(%bootstrap-inputs+toolchain))
#:guile %bootstrap-guile)))
(package
(inherit p)
@@ -1779,7 +1779,7 @@ exec " gcc "/bin/" program
("diffutils" ,diffutils-boot0)
("findutils" ,findutils-boot0)
("file" ,file-boot0)
- ,@%bootstrap-inputs+toolchain))
+ ,@(%bootstrap-inputs+toolchain)))
(define* (boot-triplet #:optional (system (%current-system)))
;; Return the triplet used to create the cross toolchain needed in the
- 131/192: gnu: mes: Update to 0.17., (continued)
- 131/192: gnu: mes: Update to 0.17., Jan Nieuwenhuizen, 2018/09/03
- 117/192: gnu: Remove gcc-mesboot-4.1.0., Jan Nieuwenhuizen, 2018/09/03
- 141/192: gnu: Add %bootstrap-diffutils., Jan Nieuwenhuizen, 2018/09/03
- 156/192: Revert "gnu: Add %bootstrap-make.", Jan Nieuwenhuizen, 2018/09/03
- 127/192: gnu: binutils-mesboot: Revise dependencies., Jan Nieuwenhuizen, 2018/09/03
- 147/192: gnu: %tinycc-seed: Update for mes 0.17.1., Jan Nieuwenhuizen, 2018/09/03
- 144/192: gnu: bootstrap-tarballs: Update inputs for i686-linux., Jan Nieuwenhuizen, 2018/09/03
- 159/192: gcc-mesboot: use package-full-name "-" :-), Jan Nieuwenhuizen, 2018/09/03
- 170/192: gnu: make-mesboot: Update to 3.82., Jan Nieuwenhuizen, 2018/09/03
- 166/192: gnu: file-boot0: Do not strip binaries or validate-runpath., Jan Nieuwenhuizen, 2018/09/03
- 169/192: bootstrap: Evaluate %bootstrap-inputs+toolchain at build time.,
Jan Nieuwenhuizen <=
- 181/192: gnu: diffutils-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 140/192: gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball., Jan Nieuwenhuizen, 2018/09/03
- 149/192: gnu: tcc-boot: Update for mes 0.17.1., Jan Nieuwenhuizen, 2018/09/03
- 143/192: gnu: Add %bootstrap-linux-libre-headers., Jan Nieuwenhuizen, 2018/09/03
- 155/192: Revert "gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball.", Jan Nieuwenhuizen, 2018/09/03
- 165/192: Revert "gnu: make-boot0: Set LOADLIBES for i686-linux.", Jan Nieuwenhuizen, 2018/09/03
- 168/192: gnu: gcc-mesboot-wrapper: Wrap g++ too., Jan Nieuwenhuizen, 2018/09/03
- 172/192: copy-linux-headers: Update for glibc-2.16.0., Jan Nieuwenhuizen, 2018/09/03
- 171/192: %bootstrap-linux-libre-headers: Update, Jan Nieuwenhuizen, 2018/09/03
- 178/192: gnu: tcc-boot0: Cleanup., Jan Nieuwenhuizen, 2018/09/03