123/207: gnu: binutils-mesboot0: Revise dependencies.

[Jan Nieuwenhuizen]

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

commit ccb93bb57fd03eccd0c056cb8240ec7e48506caa
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Thu Jul 12 20:00:43 2018 +0200

    gnu: binutils-mesboot0: Revise dependencies.
    
    * gnu/packages/mes.scm (binutils-mesboot0): Revise dependencies.
---
 gnu/packages/mes.scm | 146 +++++++++++++++++++++++++--------------------------
 1 file changed, 71 insertions(+), 75 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index a8a01b0..0abc50a 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -612,81 +612,77 @@ standard.")
 
 (define-public binutils-mesboot0
   (package-with-bootstrap-guile
-   (package
-     (inherit binutils)
-     (name "binutils-mesboot0")
-     (version "2.20.1a")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append "mirror://gnu/binutils/binutils-"
-                                   version ".tar.bz2"))
-               (patches (search-patches "binutils-boot-2.20.1a.patch"))
-               (sha256
-                (base32
-                 "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"))))
-     (supported-systems '("i686-linux"))
-     (native-inputs `(("flex" ,flex)     ; cheat
-                      ("mes" ,mes-boot)
-                      ("tcc" ,tcc-boot)))
-     (arguments
-      `(#:tests? #f                      ; runtest: command not found
-        #:parallel-build? #f
-        #:strip-binaries? #f
-        #:make-flags '("AR=tcc -ar" "RANLIB=true")
-        #:phases
-        (modify-phases %standard-phases
-          (replace 'configure
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out"))
-                    (cppflags (string-append
-                               " -D __STDC__=1 "
-                               " -D __GLIBC_MINOR__=6"
-                               " -D MES_BOOTSTRAP=1")))
-                (unsetenv "C_INCLUDE_PATH")     ; flex
-                (unsetenv "CPLUS_INCLUDE_PATH") ; flex
-                (unsetenv "CPATH")              ; flex
-                (unsetenv "LIBRARY_PATH")       ; flex
-                (setenv "PATH"
-                        (string-append
-                         (assoc-ref %build-inputs "flex") "/bin"
-                         ":" (assoc-ref %build-inputs "tcc") "/bin"
-                         ":" (assoc-ref %build-inputs "mes") "/bin"
-
-                         ;; more bootstrap cheats
-                         ":" (assoc-ref %build-inputs "bash") "/bin"
-                         ":" (assoc-ref %build-inputs "bzip2") "/bin"
-                         ":" (assoc-ref %build-inputs "coreutils") "/bin"
-                         ":" (assoc-ref %build-inputs "diffutils") "/bin"
-                         ":" (assoc-ref %build-inputs "gawk") "/bin"
-                         ":" (assoc-ref %build-inputs "grep") "/bin"
-                         ":" (assoc-ref %build-inputs "gzip") "/bin"
-                         ":" (assoc-ref %build-inputs "make") "/bin"
-                         ":" (assoc-ref %build-inputs "sed") "/bin"
-                         ":" (assoc-ref %build-inputs "tar") "/bin"))
-
-                (setenv "CONFIG_SHELL" (string-append
-                                        (assoc-ref %build-inputs "bash")
-                                        "/bin/sh"))
-                (setenv "CPPFLAGS" cppflags)
-                (setenv "AR" "tcc -ar")
-                (setenv "CXX" "false")
-                (setenv "RANLIB" "true")
-                (setenv "CC" (string-append "tcc -static" " " cppflags))
-                (setenv "LD" (string-append "tcc -static" " " cppflags))
-                (setenv "CC_FOR_BUILD" (string-append "tcc -static" " " 
cppflags))
-                (setenv "CPP" (string-append "tcc -E" " " cppflags))
-                (setenv "CC_FOR_BUILD" (string-append "tcc -static" " " 
cppflags))
-                (setenv "OBJC" (string-append "tcc -static" " " cppflags))
-                (and
-                 (zero?
-                  (system* "./configure"
-                           "--disable-nls"
-                           "--disable-shared"
-                           "--disable-werror"
-                           "--build=i686-unknown-linux-gnu"
-                           "--host=i686-unknown-linux-gnu"
-                           "--with-sysroot=/"
-                           (string-append "--prefix=" out)))))))))))))
+   (let ((p (package-with-explicit-inputs
+             binutils
+             `(("bootstrap-coreutils" ,%bootstrap-coreutils&co)
+               ("make" ,(@@ (gnu packages commencement) gnu-make-boot0))
+               ("mes" ,mes-boot)
+               ("tcc" ,tcc-boot))
+             #:guile %bootstrap-guile)))
+     (package
+       (inherit p)
+       (name "binutils-mesboot0")
+       (version "2.20.1a")
+       (source (origin
+                 (method url-fetch)
+                 (uri (string-append "mirror://gnu/binutils/binutils-"
+                                     version ".tar.bz2"))
+                 (patches (search-patches "binutils-boot-2.20.1a.patch"))
+                 (sha256
+                  (base32
+                   "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"))))
+       (native-inputs '())
+       (supported-systems '("i686-linux"))
+       (arguments
+        `(#:tests? #f                   ; runtest: command not found
+          #:parallel-build? #f
+          #:strip-binaries? #f
+          #:make-flags '("AR=tcc -ar" "RANLIB=true")
+          #:phases
+          (modify-phases %standard-phases
+            (replace 'configure
+              (lambda* (#:key outputs #:allow-other-keys)
+                (let ((out (assoc-ref outputs "out"))
+                      (cppflags (string-append
+                                 " -D __STDC__=1 "
+                                 " -D __GLIBC_MINOR__=6"
+                                 " -D MES_BOOTSTRAP=1")))
+                  ;; who sets these?
+                  (unsetenv "C_INCLUDE_PATH")
+                  (unsetenv "CPLUS_INCLUDE_PATH")
+                  (unsetenv "CPATH")
+                  (unsetenv "LIBRARY_PATH")
+                  (setenv "PATH"
+                          (string-append
+                           (assoc-ref %build-inputs "bootstrap-coreutils") 
"/bin"
+                           ":" (assoc-ref %build-inputs "make") "/bin"
+                           ":" (assoc-ref %build-inputs "tcc") "/bin"))
+
+                  (format (current-error-port) "PATH=~a\n" (getenv "PATH"))
+                  (setenv "CONFIG_SHELL" (string-append
+                                          (assoc-ref %build-inputs 
"bootstrap-coreutils")
+                                          "/bin/sh"))
+                  (format (current-error-port) "CONFIG_SHELL=~a\n" (getenv 
"CONFIG_SHELL"))
+                  (setenv "CPPFLAGS" cppflags)
+                  (setenv "AR" "tcc -ar")
+                  (setenv "CXX" "false")
+                  (setenv "RANLIB" "true")
+                  (setenv "CC" (string-append "tcc -static" " " cppflags))
+                  (setenv "LD" (string-append "tcc -static" " " cppflags))
+                  (setenv "CC_FOR_BUILD" (string-append "tcc -static" " " 
cppflags))
+                  (setenv "CPP" (string-append "tcc -E" " " cppflags))
+                  (setenv "CC_FOR_BUILD" (string-append "tcc -static" " " 
cppflags))
+                  (setenv "OBJC" (string-append "tcc -static" " " cppflags))
+                  (and
+                   (zero?
+                    (system* "./configure"
+                             "--disable-nls"
+                             "--disable-shared"
+                             "--disable-werror"
+                             "--build=i686-unknown-linux-gnu"
+                             "--host=i686-unknown-linux-gnu"
+                             "--with-sysroot=/"
+                             (string-append "--prefix=" out))))))))))))))
 
 (define-public gcc-core-mesboot
   (package-with-bootstrap-guile