[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
55/57: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.
|
From: |
guix-commits |
|
Subject: |
55/57: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash. |
|
Date: |
Mon, 16 Dec 2019 13:20:16 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 751b899639039f052ea5a6445514910b1ff63f84
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 22 23:05:15 2019 +0100
bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.
* gnu/packages/bootstrap.scm (%bootstrap-inputs)[i686-linux,x86-linux]:
Remove
%bootstrap-coreutils&co, %bootstrap-bash.
---
gnu/packages/bootstrap.scm | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index c097d93..0fbe8ef 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -809,19 +809,18 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
(define (%bootstrap-inputs)
;; The initial, pre-built inputs. From now on, we can start building our
;; own packages.
- `(,@(match (%current-system)
- ((or "i686-linux" "x86_64-linux")
- `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
- ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools)
- ("mes" ,%bootstrap-mes)))
- (_
- `(("libc" ,%bootstrap-glibc)
- ("gcc" ,%bootstrap-gcc)
- ("binutils" ,%bootstrap-binutils))))
- ("coreutils&co" ,%bootstrap-coreutils&co)
-
- ;; In gnu-build-system.scm, we rely on the availability of Bash.
- ("bash" ,%bootstrap-coreutils&co)))
+ (match (%current-system)
+ ((or "i686-linux" "x86_64-linux")
+ `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
+ ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools)
+ ("mes" ,%bootstrap-mes)))
+ (_
+ `(("libc" ,%bootstrap-glibc)
+ ("gcc" ,%bootstrap-gcc)
+ ("binutils" ,%bootstrap-binutils)
+ ("coreutils&co" ,%bootstrap-coreutils&co)
+ ;; In gnu-build-system.scm, we rely on the availability of Bash.
+ ("bash" ,%bootstrap-coreutils&co)))))
(define %bootstrap-inputs-for-tests
;; These are bootstrap inputs that are cheap to produce (no compilation
- 41/57: bootstrap: gcc-mesboot: Use Gash instead of coreutils&co., (continued)
- 41/57: bootstrap: gcc-mesboot: Use Gash instead of coreutils&co., guix-commits, 2019/12/16
- 47/57: bootstrap: Add sed-boot0., guix-commits, 2019/12/16
- 38/57: bootstrap: glibc-headers-mesboot: Use Gash instead of coreutils&co., guix-commits, 2019/12/16
- 40/57: bootstrap: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co., guix-commits, 2019/12/16
- 42/57: bootstrap: gcc-mesboot-wrapper: Use Gash instead of coreutils&co., guix-commits, 2019/12/16
- 48/57: bootstrap: Add patch-boot0., guix-commits, 2019/12/16
- 44/57: bootstrap: Remove m4-mesboot., guix-commits, 2019/12/16
- 46/57: bootstrap: Add gawk-boot0., guix-commits, 2019/12/16
- 54/57: bootstrap: %bootstrap-tarballs: Remove %bootstrap-binaries-tarball., guix-commits, 2019/12/16
- 53/57: bootstrap: coreutils-final: Inherit from coreutils-minimal., guix-commits, 2019/12/16
- 55/57: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.,
guix-commits <=
- 56/57: bootstrap: gnu-make-mesboot0: Rename from make-mesboot0., guix-commits, 2019/12/16
- 32/57: bootstrap: Add gcc-core-mesboot1., guix-commits, 2019/12/16
- 51/57: bootstrap: Typo., guix-commits, 2019/12/16
- 52/57: bootstrap: Add coreutils-boot0., guix-commits, 2019/12/16
- 57/57: bootstrap: gnu-make-mesboot: Rename from make-mesboot., guix-commits, 2019/12/16