[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
55/60: gnu: %boot0-inputs: Remove duplicate packages.
From: |
guix-commits |
Subject: |
55/60: gnu: %boot0-inputs: Remove duplicate packages. |
Date: |
Sun, 24 Nov 2024 02:50:18 -0500 (EST) |
efraim pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit 9ae681d5df83151ce3e43dcda511be562b652472
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Oct 21 15:59:02 2024 +0300
gnu: %boot0-inputs: Remove duplicate packages.
* gnu/packages/commencement.scm (%boot0-inputs): When building for i686,
x86-64 or riscv64 remove the old *-mesboot packages for newer *-boot0
packages.
Change-Id: Ide54f9185dd67765f4a35110c6bb47d5f61ba6b5
---
gnu/packages/commencement.scm | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d803ba9152..deca529dcf 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2886,13 +2886,19 @@ exec " gcc "/bin/" program
("gawk" ,gawk-boot0)
("patch" ,patch-boot0)
("sed" ,sed-boot0)
- ("tar" ,tar-boot0)))
- (_ '()))
- ("make" ,gnu-make-boot0)
- ("diffutils" ,diffutils-boot0)
- ("findutils" ,findutils-boot0)
- ("file" ,file-boot0)
- ,@(%bootstrap-inputs+toolchain)))
+ ("tar" ,tar-boot0)
+ ("make" ,gnu-make-boot0)
+ ("diffutils" ,diffutils-boot0)
+ ("findutils" ,findutils-boot0)
+ ("file" ,file-boot0)
+ ,@(fold alist-delete (%bootstrap-inputs+toolchain)
+ '("coreutils" "gawk" "patch" "sed" "tar" "make"))))
+ (_
+ `(("make" ,gnu-make-boot0)
+ ("diffutils" ,diffutils-boot0)
+ ("findutils" ,findutils-boot0)
+ ("file" ,file-boot0)
+ ,@(%bootstrap-inputs+toolchain))))))
(define* (boot-triplet #:optional (system (%current-system)))
;; Return the triplet used to create the cross toolchain needed in the
- 52/60: gnu: findutils-boot0: Adjust the skipped tests on riscv64-linux., (continued)
- 52/60: gnu: findutils-boot0: Adjust the skipped tests on riscv64-linux., guix-commits, 2024/11/24
- 21/60: gnu: tcc-boot0: Specify the build target., guix-commits, 2024/11/24
- 31/60: gnu: gmp-boot: Update and build package., guix-commits, 2024/11/24
- 32/60: gnu: mpfr-boot: Update and build package., guix-commits, 2024/11/24
- 37/60: gnu: gcc-mesboot: Adjust for changes in gcc-mesboot1., guix-commits, 2024/11/24
- 39/60: gnu: Add musl-boot., guix-commits, 2024/11/24
- 56/60: gnu: Add byacc-boot0., guix-commits, 2024/11/24
- 36/60: gnu: gcc-mesboot1: Adjust setting include paths., guix-commits, 2024/11/24
- 41/60: gnu: Add %boot-muslboot2-inputs., guix-commits, 2024/11/24
- 54/60: gnu: %boot0-inputs: Use newly built *-boot0 packages on riscv64-linux., guix-commits, 2024/11/24
- 55/60: gnu: %boot0-inputs: Remove duplicate packages.,
guix-commits <=
- 58/60: gnu: ed: Update to 1.20.2., guix-commits, 2024/11/24
- 30/60: gnu: Add m4-boot., guix-commits, 2024/11/24
- 33/60: gnu: mpc-boot: Update and build package., guix-commits, 2024/11/24
- 35/60: gnu: gcc-mesboot1: Fix native-search-paths., guix-commits, 2024/11/24
- 40/60: gnu: Add gcc-muslboot., guix-commits, 2024/11/24
- 45/60: gnu: gawk-mesboot: Remove pre-generated source file., guix-commits, 2024/11/24
- 47/60: gnu: Add %boot-muslboot3-inputs., guix-commits, 2024/11/24
- 44/60: gnu: gawk-mesboot: Support building on riscv64-linux., guix-commits, 2024/11/24
- 50/60: gnu: %bootstrap-inputs+toolchain: Switch riscv64-linux to full bootstrap., guix-commits, 2024/11/24
- 51/60: gnu: gnu-make-boot0: Adjust configure-flags on riscv64-linux., guix-commits, 2024/11/24