summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Nieuwenhuizen <janneke@gnu.org>2019-12-13 23:12:56 +0100
committerJan Nieuwenhuizen <janneke@gnu.org>2020-02-17 23:21:03 +0100
commit6340afee2852c5b81f6a34678c71d42fa17b4a7c (patch)
tree0e650e701b2cc8498e87626d448d283cccd3c24d
parentf0505fde55aa4f5b62452abeba5898378195cef4 (diff)
downloadguix-6340afee2852c5b81f6a34678c71d42fa17b4a7c.tar.gz
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.
-rw-r--r--gnu/packages/commencement.scm1
-rw-r--r--gnu/packages/make-bootstrap.scm4
2 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 13b1936260..3bb0e321f8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2754,6 +2754,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
        ,@(package-arguments file)))))
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index ef274a2ade..335d5c811d 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -889,8 +889,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)