51/63: gnu: commencement: %bootstrap-tarballs: Remove %bootstrap-binaries-tarball.

[guix-commits]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 069e6856e6889169a9ada512817ec0cbd9cf1913
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Fri Dec 13 23:12:56 2019 +0100

    gnu: commencement: %bootstrap-tarballs: Remove %bootstrap-binaries-tarball.
    
    * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[i686-linux,
    x86_64-linux]: Remove %bootstrap-binaries-tarball.
    * gnu/packages/commencement.scm (file-boot0): Drop bzlib dependency.
---
 gnu/packages/commencement.scm   | 1 +
 gnu/packages/make-bootstrap.scm | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index f9464c3..fcbea37 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2748,6 +2748,7 @@ exec " gcc "/bin/" program
      `(#:tests? #f                      ; merge test fails
        #:implicit-inputs? #f
        #:guile ,%bootstrap-guile
+       #:configure-flags '("--disable-bzlib")
        #:strip-binaries? #f
        #:validate-runpath? #f))))
 
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index eea5975..e44b669 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -884,8 +884,8 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                       ,%linux-libre-headers-bootstrap-tarball)))
                   (_ `(("gcc-tarball" ,%gcc-bootstrap-tarball)
                        ("binutils-tarball" ,%binutils-bootstrap-tarball)
-                       ("glibc-tarball" ,(%glibc-bootstrap-tarball)))))
-              ("coreutils&co-tarball" ,%bootstrap-binaries-tarball)))
+                       ("glibc-tarball" ,(%glibc-bootstrap-tarball))
+                       ("coreutils&co-tarball" 
,%bootstrap-binaries-tarball))))))
     (synopsis "Tarballs containing all the bootstrap binaries")
     (description synopsis)
     (home-page #f)