153/211: bootstrap: Remove dependency on %bootstrap-make, %bootstrap-diffutils.

[Jan Nieuwenhuizen]

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

commit 012a75a9c214decf759720a4deffbde4529b2291
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Tue Aug 28 01:09:14 2018 +0200

    bootstrap: Remove dependency on %bootstrap-make, %bootstrap-diffutils.
    
    * gnu/packages/bootstrap.scm (%bootstrap-inputs): Remove %bootstrap-make,
    %bootstrap-diffutils.
    * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs): Remove
    %make-bootstrap-tarball, %diffutils-bootstrap-tarball.
    * gnu/packages/commencement.scm (diffutils-mesboot): Replace %bootstrap-make
    with make-mesboot.
    (binutils-mesboot0): Likewise.  Replace %bootstrap-diffutils with 
diffutils-mesboot.
    (gcc-core-mesboot): Likewise.
    (glibc-mesboot): Likewise.
    (gcc-mesboot0): Likewise.
    (binutils-mesboot): Likewise.
    (gcc-mesboot): Likewise.
---
 gnu/packages/bootstrap.scm      |  4 +---
 gnu/packages/commencement.scm   | 28 +++++++++++++++-------------
 gnu/packages/make-bootstrap.scm |  4 +---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 69eb004..9fad739 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -735,9 +735,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
   ;; The initial, pre-built inputs.  From now on, we can start building our
   ;; own packages.
   `(,@(match (%current-system)
-        ("i686-linux" `(("diffutils" ,%bootstrap-diffutils)
-                        ("linux-libre-headers" ,%bootstrap-linux-libre-headers)
-                        ("make" ,%bootstrap-make)
+        ("i686-linux" `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
                         ("mescc-tools-seed" ,%mescc-tools-seed)
                         ("mes-seed" ,%mes-seed)
                         ("srfi-43" ,%srfi-43 )
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index f48c039..5c4dc9c 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -627,10 +627,11 @@
 
                       ("bash" ,%bootstrap-coreutils&co)
                       ("coreutils" ,%bootstrap-coreutils&co)
-                      ("make" ,%bootstrap-make)))
+                      ("make" ,make-mesboot)))
      (arguments
       `(#:implicit-inputs? #f
         #:guile ,%bootstrap-guile
+        #:parallel-build? #f
         ;;FIXME: why doesn't this work?
         ;;#:make-flags '("PROGRAMS=\"cmp diff\"")
         #:tests? #f           ; check is naive, also checks non-built PROGRAMS
@@ -674,8 +675,8 @@
     (native-inputs `(("tcc" ,tcc-boot)
 
                      ("coreutils" ,%bootstrap-coreutils&co)
-                     ("diffutils" ,%bootstrap-diffutils)
-                     ("make" ,%bootstrap-make)))
+                     ("diffutils" ,diffutils-mesboot)
+                     ("make" ,make-mesboot)))
     (supported-systems '("i686-linux"))
     (arguments
      `(#:implicit-inputs? #f
@@ -751,8 +752,8 @@
                       ("tcc" ,tcc-boot)
 
                       ("coreutils" ,%bootstrap-coreutils&co)
-                      ("diffutils" ,%bootstrap-diffutils)
-                      ("make" ,%bootstrap-make)))
+                      ("diffutils" ,diffutils-mesboot)
+                      ("make" ,make-mesboot)))
      (outputs '("out"))
      (arguments
       `(#:implicit-inputs? #f
@@ -873,9 +874,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
                       ("gcc" ,gcc-core-mesboot)
 
                       ("coreutils" ,%bootstrap-coreutils&co)
-                      ("diffutils" ,%bootstrap-diffutils)
+                      ("diffutils" ,diffutils-mesboot)
                       ("kernel-headers" ,%bootstrap-linux-libre-headers)
-                      ("make" ,%bootstrap-make)))
+                      ("make" ,make-mesboot)))
      (outputs '("out"))
      (arguments
       `(#:implicit-inputs? #f
@@ -964,9 +965,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
                       ("libc" ,glibc-mesboot)
 
                       ("coreutils" ,%bootstrap-coreutils&co)
-                      ("diffutils" ,%bootstrap-diffutils)
+                      ("diffutils" ,diffutils-mesboot)
                       ("kernel-headers" ,%bootstrap-linux-libre-headers)
-                      ("make" ,%bootstrap-make)))
+                      ("make" ,make-mesboot)))
      (outputs '("out"))
      (arguments
       `(#:implicit-inputs? #f
@@ -1060,13 +1061,14 @@ ac_cv_c_float_format='IEEE (little-endian)'
                       ("gcc" ,gcc-mesboot0)
 
                       ("coreutils" ,%bootstrap-coreutils&co)
-                      ("diffutils" ,%bootstrap-diffutils)
+                      ("diffutils" ,diffutils-mesboot)
                       ("kernel-headers" ,%bootstrap-linux-libre-headers)
-                      ("make" ,%bootstrap-make)))
+                      ("make" ,make-mesboot)))
      (arguments
       `(#:implicit-inputs? #f
         #:guile ,%bootstrap-guile
         #:parallel-build? #f
+        #:parallel-tests? #f
         #:configure-flags '("--enable-deterministic-archives"
                             "--disable-nls"
                             "--disable-shared"
@@ -1171,9 +1173,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
                       ("libc" ,glibc-mesboot)
 
                       ("coreutils" ,%bootstrap-coreutils&co)
-                      ("diffutils" ,%bootstrap-diffutils)
+                      ("diffutils" ,diffutils-mesboot)
                       ("kernel-headers" ,%bootstrap-linux-libre-headers)
-                      ("make" ,%bootstrap-make)))
+                      ("make" ,make-mesboot)))
      (arguments
       `(#:implicit-inputs? #f
         #:guile ,%bootstrap-guile
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 804f226..2062f86 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -828,9 +828,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
          #t)))
     (inputs `(("guile-tarball" ,%guile-bootstrap-tarball)
               ,@(match (%current-system)
-                  ("i686-linux" `(("diffutils-tarball" 
,%diffutils-bootstrap-tarball)
-                                  ("make-tarball" ,%make-bootstrap-tarball)
-                                  ("mescc-tools-seed" ,(@ (gnu packages 
bootstrap) %mescc-tools-seed))
+                  ("i686-linux" `(("mescc-tools-seed" ,(@ (gnu packages 
bootstrap) %mescc-tools-seed))
                                   ("mes-seed" ,(@ (gnu packages bootstrap) 
%mes-seed))
                                   ("srfi-43" ,(@ (gnu packages bootstrap) 
%srfi-43))
                                   ("tinycc-seed" ,(@ (gnu packages bootstrap) 
%tinycc-seed))))