185/210: gnu: glibc-mesboot0: Cleanup.

[Jan Nieuwenhuizen]

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

commit 583ab62f6bc7edf5a53f8d216a2ad139dba93576
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Sep 3 14:19:37 2018 +0200

    gnu: glibc-mesboot0: Cleanup.
    
    * gnu/packages/commencement.scm (glibc-mesboot0): Cleanup.
---
 gnu/packages/commencement.scm | 48 +++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 74dc042..306ed33 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -881,6 +881,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
      (native-inputs `(("binutils" ,binutils-mesboot0)
                       ("gcc" ,gcc-core-mesboot)
 
+                      ("bash" ,%bootstrap-coreutils&co)
                       ("coreutils" ,%bootstrap-coreutils&co)
                       ("diffutils" ,diffutils-mesboot)
                       ("headers" ,mesboot-headers)
@@ -894,7 +895,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
         #:parallel-build? #f    ; gcc-2.95.3 ICEs on massively parallel builds
         #:make-flags (list (string-append
                             "SHELL="
-                            (assoc-ref %build-inputs "coreutils")
+                            (assoc-ref %build-inputs "bash")
                             "/bin/sh"))
         #:configure-flags
         (let ((out (assoc-ref %outputs "out"))
@@ -911,47 +912,44 @@ ac_cv_c_float_format='IEEE (little-endian)'
            "--without-cvs"
            "--without-gd"
            "--without-tls"
-           ;; Build Sun/ONC RPC support.  In particular,
-           ;; install rpc/*.h.
-           "--enable-obsolete-rpc"
            (string-append "--prefix=" out)))
         #:phases
         (modify-phases %standard-phases
           (add-before 'configure 'setenv
             (lambda* (#:key outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
-                     (headers (assoc-ref %build-inputs "headers"))
+                     (bash (assoc-ref %build-inputs "bash"))
                      (gcc (assoc-ref %build-inputs "gcc"))
+                     (headers (assoc-ref %build-inputs "headers"))
                      (cppflags (string-append
-                                " -D __STDC__=1"
+                                ;;" -D __STDC__=1"
                                 " -D MES_BOOTSTRAP=1"
                                 " -D BOOTSTRAP_GLIBC=1"))
                      (cflags (string-append " -L " (getcwd))))
-                (setenv "CONFIG_SHELL" (string-append
-                                        (assoc-ref %build-inputs "coreutils")
-                                        "/bin/sh"))
+                (setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
                 (setenv "SHELL" (getenv "CONFIG_SHELL"))
-                (format (current-error-port) "CONFIG_SHELL=~s\n" (getenv 
"CONFIG_SHELL"))
-
-                (setenv "PATH"
-                        (string-append
-                         (assoc-ref %build-inputs "coreutils") "/bin"
-                         ":" (assoc-ref %build-inputs "binutils") "/bin"
-                         ":" (assoc-ref %build-inputs "gcc") "/bin"
-                         ":" (assoc-ref %build-inputs "diffutils") "/bin"
-                         ":" (assoc-ref %build-inputs "make") "/bin"))
-
                 (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags))
                 (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
-                (unsetenv "C_INCLUDE_PATH")
-                (unsetenv "LIBRARY_PATH"))))
-          ;; glibc-2.2.5 needs a slightly more classical invocation of 
configure
+                #t)))
+          ;; glibc-2.2.5 needs a more classic invocation of configure
           ;; configure: warning: 
CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash:
 invalid host type
           (replace 'configure
             (lambda* (#:key configure-flags #:allow-other-keys)
-              (format (current-error-port) "running ./configure ~a\n" 
(string-join configure-flags))
-              (zero?
-               (apply system* "./configure" configure-flags))))))))))
+              (format (current-error-port)
+                      "running ./configure ~a\n" (string-join configure-flags))
+              (apply invoke "./configure" configure-flags))))))
+     (native-search-paths
+      ;; Use the language-specific variables rather than 'CPATH' because they
+      ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'.
+      ;; The intent is to allow headers that are in the search path to be
+      ;; treated as "system headers" (headers exempt from warnings) just like
+      ;; the typical /usr/include headers on an FHS system.
+      (list (search-path-specification
+             (variable "C_INCLUDE_PATH")
+             (files '("include")))
+            (search-path-specification
+             (variable "LIBRARY_PATH")
+             (files '("lib"))))))))
 
 (define-public gcc-mesboot0
   (package-with-bootstrap-guile