173/211: gnu: Add mesboot-headers.

[Jan Nieuwenhuizen]

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

commit bacf48f2078ac0c24c15e142e194c27946cd9f37
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Sep 3 00:30:49 2018 +0200

    gnu: Add mesboot-headers.
    
    * gnu/packages/commencement.scm (mesboot-headers): Add mesboot-headers.
    Update users.
---
 gnu/packages/commencement.scm | 60 ++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 588bf7d..2d4ead3 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -852,6 +852,35 @@ ac_cv_c_float_format='IEEE (little-endian)'
                  (copy-recursively (string-append tcc "/include")
                                    (string-append out "/include"))))))))))))
 
+(define-public mesboot-headers
+  (package-with-bootstrap-guile
+   (package
+     (inherit mes-boot)
+     (name "mesboot-headers")
+     (supported-systems '("i686-linux"))
+     (inputs '())
+     (propagated-inputs '())
+     (native-inputs `(("coreutils" ,%bootstrap-coreutils&co)
+                      ("headers" ,%bootstrap-linux-libre-headers)))
+     (arguments
+      `(#:implicit-inputs? #f
+        #:guile ,%bootstrap-guile
+        #:tests? #f
+        #:strip-binaries? #f
+        #:phases
+        (modify-phases %standard-phases
+          (delete 'configure)
+          (delete 'build)
+          (replace 'install
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (include (string-append out "/include"))
+                     (headers (assoc-ref %build-inputs "headers" )))
+                (mkdir-p include)
+                (copy-recursively "include" out)
+                (copy-recursively headers out)
+                #t)))))))))
+
 (define-public glibc-mesboot0
   (package-with-bootstrap-guile
    (package
@@ -875,7 +904,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
 
                       ("coreutils" ,%bootstrap-coreutils&co)
                       ("diffutils" ,diffutils-mesboot)
-                      ("kernel-headers" ,%bootstrap-linux-libre-headers)
+                      ("headers" ,mesboot-headers)
                       ("make" ,make-mesboot0)))
      (outputs '("out"))
      (arguments
@@ -890,7 +919,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
                             "/bin/sh"))
         #:configure-flags
         (let ((out (assoc-ref %outputs "out"))
-              (headers (assoc-ref %build-inputs "kernel-headers")))
+              (headers (assoc-ref %build-inputs "headers")))
           (list
            "--disable-shared"
            "--enable-static"
@@ -912,7 +941,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
           (add-before 'configure 'setenv
             (lambda* (#:key outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
-                     (headers (assoc-ref %build-inputs "kernel-headers"))
+                     (headers (assoc-ref %build-inputs "headers"))
                      (gcc (assoc-ref %build-inputs "gcc"))
                      (cppflags (string-append
                                 " -D __STDC__=1"
@@ -1445,6 +1474,7 @@ exec " gcc "/bin/" program
      (native-inputs `(("binutils" ,binutils-mesboot)
                       ("libc" ,glibc-mesboot0)
                       ("gcc" ,gcc-mesboot)
+                      ("headers" ,mesboot-headers)
 
                       ("coreutils" ,%bootstrap-coreutils&co)
                       ("diffutils" ,diffutils-mesboot)
@@ -1464,7 +1494,7 @@ exec " gcc "/bin/" program
                            "install-bootstrap-headers=yes" "install-headers")
         #:configure-flags
         (let ((out (assoc-ref %outputs "out"))
-              (headers (assoc-ref %build-inputs "kernel-headers")))
+              (headers (assoc-ref %build-inputs "headers")))
           (list
            ;;"--disable-shared"
            ;;"--enable-static"
@@ -1489,19 +1519,13 @@ exec " gcc "/bin/" program
           (add-before 'configure 'setenv
             (lambda* (#:key outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
-                     (headers (assoc-ref %build-inputs "kernel-headers"))
+                     (headers (assoc-ref %build-inputs "headers"))
                      (coreutils (assoc-ref %build-inputs "coreutils"))
                      (libc (assoc-ref %build-inputs "libc"))
                      (gcc (assoc-ref %build-inputs "gcc"))
                      (cppflags (string-append
-                                ;;" -v"
                                 " -I " libc "/include"
-                                ;; " -I " (getcwd) "/include"
                                 " -I " headers "/include"
-                                ;;; ../include/limits.h:124:26: fatal error: 
limits.h: No such file or directory
-                                " -I " headers "/include/linux" ;; limits.h
-                                ;; " -D __STDC__=1"
-                                ;;" -D MES_BOOTSTRAP=1"
                                 " -D BOOTSTRAP_GLIBC=1"
                                 " -Dsize_t=int -Dwchar_t=int"
                                 ))
@@ -1611,18 +1635,8 @@ exec " gcc "/bin/" program
                      (libc (assoc-ref %build-inputs "libc"))
                      (gcc (assoc-ref %build-inputs "gcc"))
                      (cppflags (string-append
-                                ;;" -v"
-                                ;; " -I " (getcwd) "/include"
-                                " -I " libc "/include"
-                                " -I " headers "/include"
-                                ;;" -I " headers "/include/linux"
-                                " -I " kernel-headers "/include/linux"
-;;; ../include/limits.h:124:26: fatal error: limits.h: No such file or 
directory
-;;; " -I " headers "/include/linux" ;; limits.h
-                                ;; " -D __STDC__=1"
-                                ;;" -D MES_BOOTSTRAP=1"
-                                " -D BOOTSTRAP_GLIBC=1"
-                                ))
+                                " -I " (getcwd) "/nptl/sysdeps/pthread/bits"
+                                " -D BOOTSTRAP_GLIBC=1"))
                      (cflags (string-append " -L " (getcwd)
                                             " -L " libc "/lib")))
                 (setenv "CONFIG_SHELL" (string-append