188/211: gnu: binutils-mesboot: Cleanup.

[Jan Nieuwenhuizen]

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

commit 046c92425ffade5dfea94c260f991c32ad19381e
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Sep 3 16:31:37 2018 +0200

    gnu: binutils-mesboot: Cleanup.
    
    * gnu/packages/commencement.scm (binutils-mesboot): Cleanup.
---
 gnu/packages/commencement.scm | 72 ++++++-------------------------------------
 1 file changed, 9 insertions(+), 63 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b2b67b6..d287e77 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1032,78 +1032,24 @@ ac_cv_c_float_format='IEEE (little-endian)'
    (package
      (inherit binutils-mesboot0)
      (name "binutils-mesboot")
-     (inputs '())
-     (propagated-inputs '())
      (native-inputs `(("binutils" ,binutils-mesboot0)
                       ("libc" ,glibc-mesboot0)
                       ("gcc" ,gcc-mesboot0)
 
+                      ("bash" ,%bootstrap-coreutils&co)
                       ("coreutils" ,%bootstrap-coreutils&co)
                       ("diffutils" ,diffutils-mesboot)
                       ("kernel-headers" ,%bootstrap-linux-libre-headers)
                       ("make" ,make-mesboot0)))
      (arguments
-      `(#:implicit-inputs? #f
-        #:guile ,%bootstrap-guile
-        #:parallel-build? #f
-        #:parallel-tests? #f
-        #:configure-flags '("--enable-deterministic-archives"
-                            "--disable-nls"
-                            "--disable-shared"
-                            "--disable-werror"
-                            "--build=i686-unknown-linux-gnu"
-                            "--host=i686-unknown-linux-gnu"
-                            "--enable-static"
-                            "--enable-compressed-debug-sections=no"
-                            "--disable-gold"
-                            "--disable-plugins"
-                            "--disable-x86-relax-relocations"
-                            "--with-system-libz"
-                            "--with-sysroot=/"
-                            )
-        #:phases
-        (modify-phases %standard-phases
-          (replace 'configure
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out"))
-                    (gcc (assoc-ref %build-inputs "gcc"))
-                    (glibc (assoc-ref %build-inputs "libc"))
-                    (kernel-headers  (assoc-ref %build-inputs 
"kernel-headers")))
-                (setenv "C_INCLUDE_PATH"
-                        (string-append glibc "/include"
-                                       ":" kernel-headers "/include"
-                                       ":" gcc "/include"))
-                (setenv "LIBRARY_PATH"
-                        (string-append glibc "/lib"
-                                       ":" gcc "/lib"))
-                (setenv "CPP" (string-append "gcc -E"))
-                (setenv "AR" "ar")
-                (setenv "RANLIB" "true")
-                (setenv "PATH"
-                        (string-append
-                         (assoc-ref %build-inputs "binutils") "/bin"
-                         ":" (assoc-ref %build-inputs "gcc") "/bin"
-
-                         ;; more bootstrap cheats
-                         ":" (assoc-ref %build-inputs "coreutils") "/bin"
-                         ":" (assoc-ref %build-inputs "diffutils") "/bin"
-                         ":" (assoc-ref %build-inputs "make") "/bin"))
-                (setenv "CONFIG_SHELL" (string-append
-                                        (assoc-ref %build-inputs "coreutils")
-                                        "/bin/sh"))
-                (format (current-error-port) "PATH=~a\n" (getenv "PATH"))
-                (format (current-error-port) "CONFIG_SHELL=~a\n" (getenv 
"CONFIG_SHELL"))
-                (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv 
"C_INCLUDE_PATH"))
-                (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv 
"LIBRARY_PATH"))
-                (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))))))))))))
+      `(,@(substitute-keyword-arguments (package-arguments binutils-mesboot0)
+            ((#:configure-flags configure-flags)
+             '(list "--disable-nls"
+                    "--disable-shared"
+                    "--disable-werror"
+                    "--build=i686-unknown-linux-gnu"
+                    "--host=i686-unknown-linux-gnu"
+                    "--with-sysroot=/"))))))))
 
 (define-public make-mesboot
   (package-with-bootstrap-guile