28/35: bootstrap: diffuils-mesboot: Scheme-only bootstrap.

[guix-commits]

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

commit d10c9e3009423ab4abb425aba238ac2816046b84
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sun Sep 22 00:56:46 2019 +0200

    bootstrap: diffuils-mesboot: Scheme-only bootstrap.
    
    * gnu/packages/commencement.scm (diffutils-mesboot): Scheme-only bootstrap.
---
 gnu/packages/commencement.scm | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 6aaf70d..191f4d3 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -780,12 +780,12 @@
      (supported-systems '("i686-linux" "x86_64-linux"))
      (inputs '())
      (propagated-inputs '())
-     (native-inputs `(("mes" ,mes-boot)
-                      ("tcc" ,tcc-boot)
-
-                      ("bash" ,%bootstrap-coreutils&co)
-                      ("coreutils" ,%bootstrap-coreutils&co)
-                      ("make" ,make-mesboot0)))
+     (native-inputs `(("bash" ,bash-mesboot0)
+                      ("gash" ,%bootstrap-gash)
+                      ("guile" ,%bootstrap-guile)
+                      ("gzip" ,gzip-mesboot)
+                      ("make" ,make-mesboot0)
+                      ("tcc" ,tcc-boot)))
      (arguments
       `(#:implicit-inputs? #f
         #:guile ,%bootstrap-guile
@@ -794,20 +794,29 @@
         #:strip-binaries? #f  ; no strip yet
         #:phases
         (modify-phases %standard-phases
-          ;; diffutils-2.7 needs more traditional configure
-          (replace 'configure
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out"))
-                    (bash (assoc-ref %build-inputs "bash")))
-                (setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
-                (setenv "CC" "tcc")
-                (setenv "LD" "tcc")
-                (invoke "./configure" (string-append "--prefix=" out)))))
           (add-before 'configure 'remove-diff3-sdiff
             (lambda* (#:key outputs #:allow-other-keys)
               (substitute* "Makefile.in"
-                (("PROGRAMS = .*" all) "PROGRAMS = cmp diff"))
-              #t))))))))
+                (("PROGRAMS = .*" all) "PROGRAMS = cmp diff"))))
+          (replace 'configure ; needs classic invocation of configure
+            (lambda* (#:key configure-flags #:allow-other-keys)
+              (let* ((out (assoc-ref %outputs "out"))
+                     (bash (assoc-ref %build-inputs "bash"))
+                     (shell (string-append bash "/bin/bash")))
+                (setenv "CONFIG_SHELL" shell)
+                (setenv "CC" "tcc")
+                (setenv "LD" "tcc")
+                (format (current-error-port)
+                        "running ./configure ~a\n" (string-join 
configure-flags))
+                (apply invoke (cons "./configure" configure-flags)))))
+          (replace 'install
+            (lambda _
+              (let* ((out (assoc-ref %outputs "out"))
+                     (bin (string-append out "/bin")))
+                (mkdir-p bin)
+                (install-file "cmp" bin)
+                (install-file "diff" bin)
+                #t)))))))))
 
 (define binutils-mesboot0
   (package-with-bootstrap-guile