[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
55/63: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.
From: |
guix-commits |
Subject: |
55/63: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash. |
Date: |
Sun, 24 Nov 2019 06:09:27 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 3f2622fe4727846e54d64de53f41be7400569260
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 c026db2..b97b904 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -868,19 +868,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
- 45/63: bootstrap: binutils-mesboot: Scheme-only bootstrap., (continued)
- 45/63: bootstrap: binutils-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/24
- 46/63: bootstrap: glibc-headers-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/24
- 47/63: bootstrap: glibc-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/24
- 48/63: bootstrap: gcc-mesboot1-wrapper: Scheme-only bootstrap., guix-commits, 2019/11/24
- 49/63: bootstrap: gcc-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/24
- 50/63: bootstrap: gcc-mesboot-wrapper: Scheme-only bootstrap., guix-commits, 2019/11/24
- 52/63: bootstrap: Remove m4-bootstrap., guix-commits, 2019/11/24
- 51/63: bootstrap: Add coreutils-mesboot., guix-commits, 2019/11/24
- 53/63: bootstrap: %bootstrap-inputs+toolchain: Scheme-only bootstrap., guix-commits, 2019/11/24
- 54/63: bootstrap: Add sed-boot0., guix-commits, 2019/11/24
- 55/63: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.,
guix-commits <=
- 56/63: gnu: Add ed-1.4., guix-commits, 2019/11/24
- 57/63: bootstrap: Add ed-boot0., guix-commits, 2019/11/24
- 58/63: bootstrap: Add patch-boot0., guix-commits, 2019/11/24
- 59/63: bootstrap: Add bzip2-boot0., guix-commits, 2019/11/24
- 60/63: bootstrap: Add tar-boot0., guix-commits, 2019/11/24
- 61/63: bootstrap: Typo., guix-commits, 2019/11/24
- 62/63: bootstrap: Add coreutils-boot0., guix-commits, 2019/11/24
- 63/63: bootstrap: ACL: disable tests. FIXME: LD_PRELOAD., guix-commits, 2019/11/24