113/160: gnu: binutils-mesboot0: Package with bootstrap-guile.

[Jan Nieuwenhuizen]

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

commit c28cd5a5d1248aed8a84c3a1322dfbbcc1a9343a
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Jun 29 21:15:57 2018 +0200

    gnu: binutils-mesboot0: Package with bootstrap-guile.
    
    * gnu/packages/mes.scm (binutils-mesboot0): Package with bootstrap-guile.
---
 gnu/packages/mes.scm | 145 ++++++++++++++++++++++++++-------------------------
 1 file changed, 73 insertions(+), 72 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 8a87d0a..afad180 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -637,80 +637,81 @@ standard.")
                           (string-append "--prefix=" out))))))))))))
 
 (define-public binutils-mesboot0
-  (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"
+  (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"))
+                         ;; 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"
-                          "--host=i386-unknown-linux"
-                          "--target=i386-unknown-linux"
-                          (string-append "--prefix=" out))))))))))))
+                (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"
+                           "--host=i386-unknown-linux"
+                           "--target=i386-unknown-linux"
+                           (string-append "--prefix=" out)))))))))))))
 
 (define-public gcc-core-mesboot
   (package