[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/16: bootstrap: %bootstrap-inputs+toolchain: Replace %bootstrap-inputs
From: |
Jan Nieuwenhuizen |
Subject: |
02/16: bootstrap: %bootstrap-inputs+toolchain: Replace %bootstrap-inputs. |
Date: |
Sun, 23 Sep 2018 03:49:20 -0400 (EDT) |
janneke pushed a commit to branch core-updates-next
in repository guix.
commit c362904485d3c8c3f155538ab2f7cd082b334801
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sun Sep 9 13:33:41 2018 +0200
bootstrap: %bootstrap-inputs+toolchain: Replace %bootstrap-inputs.
* gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): : New
procedure
replacing %bootstrap-inputs to prepare for Mes bootstrap. Update users.
* tests/union.scm (%bootstrap-inputs): New variable: set to
%bootstrap-inputs+toolchain.
---
gnu/packages/commencement.scm | 19 +++++++++++--------
tests/union.scm | 4 ++++
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a4e71b0..12d5b52 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -79,6 +79,9 @@
;;;
;;; Code:
+(define (%bootstrap-inputs+toolchain)
+ (%bootstrap-inputs))
+
(define gnu-make-boot0
(package-with-bootstrap-guile
(package (inherit gnu-make)
@@ -101,13 +104,13 @@
(install-file "make" bin)
#t))))))))
(native-inputs '()) ; no need for 'pkg-config'
- (inputs (%bootstrap-inputs)))))
+ (inputs (%bootstrap-inputs+toolchain)))))
(define diffutils-boot0
(package-with-bootstrap-guile
(let ((p (package-with-explicit-inputs diffutils
`(("make" ,gnu-make-boot0)
- ,@(%bootstrap-inputs))
+ ,@(%bootstrap-inputs+toolchain))
#:guile %bootstrap-guile)))
(package (inherit p)
(name "diffutils-boot0")
@@ -121,7 +124,7 @@
(name "findutils-boot0"))
`(("make" ,gnu-make-boot0)
("diffutils" ,diffutils-boot0) ; for tests
- ,@(%bootstrap-inputs))
+ ,@(%bootstrap-inputs+toolchain))
(current-source-location)
#:guile %bootstrap-guile)))
@@ -131,17 +134,16 @@
(inherit file)
(name "file-boot0"))
`(("make" ,gnu-make-boot0)
- ,@(%bootstrap-inputs))
+ ,@(%bootstrap-inputs+toolchain))
(current-source-location)
#:guile %bootstrap-guile)))
-
(define (%boot0-inputs)
`(("make" ,gnu-make-boot0)
("diffutils" ,diffutils-boot0)
("findutils" ,findutils-boot0)
("file" ,file-boot0)
- ,@(%bootstrap-inputs)))
+ ,@(%bootstrap-inputs+toolchain)))
(define* (boot-triplet #:optional (system (%current-system)))
;; Return the triplet used to create the cross toolchain needed in the
@@ -150,8 +152,9 @@
;; Following Linux From Scratch, build a cross-toolchain in stage 0. That
;; toolchain actually targets the same OS and arch, but it has the advantage
-;; of being independent of the libc and tools in (%BOOTSTRAP-INPUTS), since
-;; GCC-BOOT0 (below) is built without any reference to the target libc.
+;; of being independent of the libc and tools in
+;; (%BOOTSTRAP-INPUTS+TOOLCHAIN), since GCC-BOOT0 (below) is built without any
+;; reference to the target libc.
(define binutils-boot0
(package-with-bootstrap-guile
diff --git a/tests/union.scm b/tests/union.scm
index 5599625..091895f 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,6 +32,9 @@
#:use-module (rnrs io ports)
#:use-module (ice-9 match))
+(define %bootstrap-inputs
+ (@@ (gnu packages commencement) %bootstrap-inputs+toolchain))
+
;; Exercise the (guix build union) module.
(define %store
- branch core-updates-next created (now 0db65c1), Jan Nieuwenhuizen, 2018/09/23
- 03/16: gnu: m4-boot0: New variable., Jan Nieuwenhuizen, 2018/09/23
- 04/16: bootstrap: Use thunk for inputs in package-with-explicit-inputs., Jan Nieuwenhuizen, 2018/09/23
- 01/16: bootstrap: %bootstrap-inputs: Wrap input lists into thunks., Jan Nieuwenhuizen, 2018/09/23
- 05/16: bootstrap: static-bash-for-glibc: Consider %current-system at run time., Jan Nieuwenhuizen, 2018/09/23
- 08/16: gnu: Add linux-libre-headers-bootstrap-tarball., Jan Nieuwenhuizen, 2018/09/23
- 13/16: bootstrap: Replace GNU toolchain seeds with Mes for i686-linux., Jan Nieuwenhuizen, 2018/09/23
- 11/16: bootstrap: bison-boot0: Do not use `ranlib -D'., Jan Nieuwenhuizen, 2018/09/23
- 16/16: tests: Update package-transitive-supported-systems tests., Jan Nieuwenhuizen, 2018/09/23
- 02/16: bootstrap: %bootstrap-inputs+toolchain: Replace %bootstrap-inputs.,
Jan Nieuwenhuizen <=
- 12/16: bootstrap: perl-boot0: Disable validate-runpath?., Jan Nieuwenhuizen, 2018/09/23
- 07/16: guix: copy-linux-headers: Extract procedure, add headers., Jan Nieuwenhuizen, 2018/09/23
- 06/16: guix: package-from-tarball: Allow PROGRAM-TO-TEST to be #f., Jan Nieuwenhuizen, 2018/09/23
- 09/16: bootstrap: Add Mes bootstrap seeds., Jan Nieuwenhuizen, 2018/09/23
- 14/16: doc: Describe the Reduced Binary Seed bootstrap., Jan Nieuwenhuizen, 2018/09/23
- 15/16: bootstrap: Reduced Binary Seed bootstrap for x86_64 too., Jan Nieuwenhuizen, 2018/09/23
- 10/16: bootstrap: Add Mes bootstrap., Jan Nieuwenhuizen, 2018/09/23