guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

174/207: gnu: glibc-mesboot: Update to 2.16.0.


From: Jan Nieuwenhuizen
Subject: 174/207: gnu: glibc-mesboot: Update to 2.16.0.
Date: Sat, 8 Sep 2018 13:26:26 -0400 (EDT)

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

commit 98671747b6e585a01ac93265440e4fd154007c14
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Sep 3 00:38:47 2018 +0200

    gnu: glibc-mesboot: Update to 2.16.0.
    
    * gnu/packages/commencement.scm (glibc-headers-mesboot): Update to 2.16.0.
    (glibc-mesboot): Likewise.
    * gnu/packages/patches/glibc-boot-2.16.0.patch: New file.
    * gnu/packages/patches/glibc-glibc-bootstrap-2.16.0.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add them.
---
 gnu/local.mk                                       |   2 +
 gnu/packages/commencement.scm                      | 127 ++-
 gnu/packages/patches/glibc-boot-2.16.0.patch       | 459 +++++++++++
 gnu/packages/patches/glibc-boot-2.3.6.patch        | 856 ---------------------
 .../patches/glibc-bootstrap-system-2.16.0.patch    |  30 +
 5 files changed, 554 insertions(+), 920 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 76e6bbc..3b645a5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -743,7 +743,9 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch                \
   %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch                \
   %D%/packages/patches/glibc-allow-kernel-2.6.32.patch         \
+  %D%/packages/patches/glibc-boot-2.16.0.patch                 \
   %D%/packages/patches/glibc-boot-2.2.5.patch                  \
+  %D%/packages/patches/glibc-bootstrap-2.16.0.patch            \
   %D%/packages/patches/glibc-bootstrap-system.patch            \
   %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch  \
   %D%/packages/patches/glibc-ldd-x86_64.patch                  \
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 2d4ead3..35a0fa9 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1189,7 +1189,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
         #:tests? #f                     ; check depends on perl
         #:guile ,%bootstrap-guile
         #:strip-binaries? #f   ; binutil's strip b0rkes MesCC/M1/hex2 binaries
-        ;;#:configure-flags '("LIBS=-lc -lnss_files -lnss_dns -lresolv")
         #:phases
         (modify-phases %standard-phases
           ;; https://gcc.gnu.org/ml/gcc/1998-12/msg00083.html 2.22
@@ -1441,33 +1440,17 @@ exec " gcc "/bin/" program
    (package
      (inherit glibc)
      (name "glibc-headers-mesboot")
-     ;; (version "2.2.5")
-     ;; (version "2.3")
-     ;; (version "2.3.4")
-     (version "2.3.6")
-     ;; (version "2.4")
-     ;; (version "2.5")
+     (version "2.16.0")
      (source (origin
                (method url-fetch)
                (uri (string-append "mirror://gnu/glibc/glibc-"
                                    version
                                    ".tar.gz"))
-               (patches (search-patches "glibc-boot-2.3.6.patch"))
+               (patches (search-patches "glibc-boot-2.16.0.patch"
+                                        "glibc-bootstrap-system-2.16.0.patch"))
                (sha256
                 (base32
-                 ;; 2.2.5
-                 ;; "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q"
-                 ;; 2.3
-                 ;; "1n1z8lpfk3vpwwxhivf36pg8qqll6mhipqghqc9xgd9gqyb0bcpw"
-                 ;; 2.3.4
-                 ;; "0syn8vlkmn5lz02b3v5i6np820ih551fv0dpg0fg2mp9mc51lpzc"
-                 ;; 2.3.6
-                 "1kb6pa9gs5gfskhis9my80sij515mcyn78zghkxsr4r2y6lkf4hq"
-                 ;; 2.4
-                 ;; "1rzx7ahrvkw4v3lm9nm5glnzqqf9bhpmbkr9v6vsr72k9jspf634"
-                 ;; 2.5
-                 ;; "14rlbbw1s66cs1d6p5lh6pqjg3fmdd5227qgv22mvmzfhr7arlqn"
-                 ))))
+                 "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7"))))
      (supported-systems '("i686-linux"))
      (inputs '())
      (propagated-inputs '())
@@ -1496,23 +1479,16 @@ exec " gcc "/bin/" program
         (let ((out (assoc-ref %outputs "out"))
               (headers (assoc-ref %build-inputs "headers")))
           (list
-           ;;"--disable-shared"
-           ;;"--enable-static"
-           ;; Build Sun/ONC RPC support.  In particular,
-           ;; install rpc/*.h.
-           "--enable-obsolete-rpc"
-
+           "--disable-obsolete-rpc"
            "--disable-sanity-checks"
            "--build=i686-unknown-linux-gnu"
            "--host=i686-unknown-linux-gnu"
            (string-append "--with-headers=" headers "/include")
            "--enable-static-nss"
-           ;; "--without-pthread"
-           ;; "--without-threads"
-           ;; "--without-__thread"
+           "--with-pthread"
            "--without-cvs"
            "--without-gd"
-           "--without-tls"
+           "--enable-add-ons=nptl"
            (string-append "--prefix=" out)))
         #:phases
         (modify-phases %standard-phases
@@ -1531,6 +1507,7 @@ exec " gcc "/bin/" program
                                 ))
                      (cflags (string-append " -L " (getcwd)
                                             " -L " libc "/lib")))
+                (setenv "libc_cv_friendly_stddef" "yes")
                 (setenv "CONFIG_SHELL" (string-append
                                         (assoc-ref %build-inputs "coreutils")
                                         "/bin/sh"))
@@ -1548,10 +1525,9 @@ exec " gcc "/bin/" program
                 (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags))
                 (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
 
+                ;; avoid -fstack-protector
+                (setenv "libc_cv_ssp" "false")
                 (substitute* "configure"
-                  (("[*]gcc-2.9.*[)]" all) (string-append "*[34].*|" all))
-                  (("3[.][[]2-9[]][*][)]" all) (string-append "*[34].*|" all))
-                  (("2[.]1[[]3-9[]][*][)]" all) (string-append 
"*2.[123][0-9].*|" all))
                   (("/bin/pwd") (string-append coreutils "/bin/pwd")))
                 (setenv "C_INCLUDE_PATH" (string-append libc "/include"
                                                         headers "/include"))
@@ -1561,8 +1537,8 @@ exec " gcc "/bin/" program
               (let ((kernel-headers (assoc-ref %build-inputs "kernel-headers"))
                     (out (assoc-ref outputs "out")))
                 (and (apply invoke "make" make-flags)
-                     ;; do we need this?
-                    (copy-recursively kernel-headers out)))))
+                     (copy-recursively kernel-headers out)
+                     #t))))
           ;; glibc-2.2.5 needs a slightly more classical invocation of 
configure
           ;; configure: warning: 
CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash:
 invalid host type
           (replace 'configure
@@ -1571,7 +1547,20 @@ exec " gcc "/bin/" program
               (mkdir-p "build")
               (chdir "build")
               (zero?
-               (apply system* "../configure" configure-flags))))))))))
+               (apply system* "../configure" configure-flags))))
+          (add-after 'configure 'remove-sunrpc
+            (lambda _
+              (invoke "make" (string-append (getcwd) "/sysd-sorted" )
+                      (string-append "SHELL=" (getenv "CONFIG_SHELL")))
+              (system* "ls" "-ltrF" "." "build")
+              (substitute* "sysd-sorted"
+                ((" sunrpc ") " "))
+              (substitute* "../Makefile"
+                (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv 
"CONFIG_SHELL"))))
+              (substitute* "../Makeconfig"
+                (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv 
"CONFIG_SHELL"))))
+              (substitute* "../elf/Makefile"
+                (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv 
"CONFIG_SHELL"))))))))))))
 
 (define-public glibc-mesboot
   (package-with-bootstrap-guile
@@ -1587,42 +1576,31 @@ exec " gcc "/bin/" program
                       ("diffutils" ,diffutils-mesboot)
                       ("kernel-headers" ,%bootstrap-linux-libre-headers)
                       ("make" ,make-mesboot)))
-     (outputs '("out"))
      (arguments
       `(#:implicit-inputs? #f
         #:guile ,%bootstrap-guile
         #:tests? #f
         #:strip-binaries? #f
+        #:validate-runpath? #f
         #:parallel-build? #f    ; gcc-2.95.3 ICEs on massively parallel builds
         #:make-flags (list (string-append
                             "SHELL="
                             (assoc-ref %build-inputs "coreutils")
-                            "/bin/sh")
-                           ;;;"install-bootstrap-headers=yes" "install-headers"
-                           )
+                            "/bin/sh"))
         #:configure-flags
         (let ((out (assoc-ref %outputs "out"))
               (libc (assoc-ref %build-inputs "libc"))
               (headers (assoc-ref %build-inputs "headers")))
           (list
-           ;;"--disable-shared"
-           ;;"--enable-static"
-           ;; Build Sun/ONC RPC support.  In particular,
-           ;; install rpc/*.h.
-           "--enable-obsolete-rpc"
-
+           "--disable-obsolete-rpc"
            "--disable-sanity-checks"
            "--build=i686-unknown-linux-gnu"
            "--host=i686-unknown-linux-gnu"
-           ;;;(string-append "--with-headers=" headers "/include")
-           (string-append "--with-headers=" libc "/include") ;;;geen idee
+           (string-append "--with-headers=" headers "/include")
            "--enable-static-nss"
-           ;; "--without-pthread"
-           ;; "--without-threads"
-           ;; "--without-__thread"
            "--without-cvs"
            "--without-gd"
-           "--without-tls"
+           "--enable-add-ons=nptl"
            (string-append "--prefix=" out)))
         #:phases
         (modify-phases %standard-phases
@@ -1656,26 +1634,47 @@ exec " gcc "/bin/" program
                 (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags))
                 (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
 
+                ;; avoid -fstack-protector
+                (setenv "libc_cv_ssp" "false")
                 (substitute* "configure"
-                  (("[*]gcc-2.9.*[)]" all) (string-append "*[34].*|" all))
-                  (("3[.][[]2-9[]][*][)]" all) (string-append "*[34].*|" all))
-                  (("2[.]1[[]3-9[]][*][)]" all) (string-append 
"*2.[123][0-9].*|" all))
                   (("/bin/pwd") (string-append coreutils "/bin/pwd")))
                 (setenv "C_INCLUDE_PATH" (string-append libc "/include"
                                                         headers "/include"))
-                (setenv "LIBRARY_PATH" (string-append libc "/lib")))))
-          (replace 'install
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (apply invoke "make" make-flags)))
-          ;; glibc-2.2.5 needs a slightly more classical invocation of 
configure
-          ;; configure: warning: 
CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash:
 invalid host type
+                (setenv "LIBRARY_PATH" (string-append libc "/lib"))
+                #t)))
           (replace 'configure
             (lambda* (#:key configure-flags #:allow-other-keys)
               (format (current-error-port) "running ../configure ~a\n" 
(string-join configure-flags))
               (mkdir-p "build")
               (chdir "build")
-              (zero?
-               (apply system* "../configure" configure-flags))))))))))
+              (apply invoke "../configure" configure-flags)))
+          (add-after 'configure 'fixup-/bin/sh
+            (lambda _
+              (invoke "make" (string-append (getcwd) "/sysd-sorted" )
+                      (string-append "SHELL=" (getenv "CONFIG_SHELL")))
+              (substitute* "sysd-sorted"
+                ((" sunrpc ") " ")
+                ((" nis ") " "))
+              ;; 'rpcgen' needs native libc headers to be built.
+              (let ((libc (assoc-ref %build-inputs "libc")))
+                (substitute* "../sunrpc/Makefile"
+                  (("sunrpc-CPPFLAGS =.*")
+                   (string-append "sunrpc-CPPFLAGS ="
+                                  " -I" libc "/include\n"))))
+              (substitute* "../Makefile"
+                (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv 
"CONFIG_SHELL"))))
+              (substitute* "../Makeconfig"
+                (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv 
"CONFIG_SHELL"))))
+              (substitute* "../elf/Makefile"
+                (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv 
"CONFIG_SHELL"))))
+              #t))
+          (replace 'install
+            (lambda* (#:key outputs make-flags #:allow-other-keys)
+              (let ((kernel-headers (assoc-ref %build-inputs "kernel-headers"))
+                    (out (assoc-ref outputs "out")))
+                (and (apply invoke "make" make-flags)
+                     (copy-recursively kernel-headers out)
+                     #t))))))))))
 
 (define-public m4-mesboot
   (package-with-bootstrap-guile
diff --git a/gnu/packages/patches/glibc-boot-2.16.0.patch 
b/gnu/packages/patches/glibc-boot-2.16.0.patch
new file mode 100644
index 0000000..d49fe95
--- /dev/null
+++ b/gnu/packages/patches/glibc-boot-2.16.0.patch
@@ -0,0 +1,459 @@
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/adiff 
glibc-2.16.0/adiff
+--- /home/janneke/src/glibc-2.16.0/adiff       1970-01-01 01:00:00.000000000 
+0100
++++ glibc-2.16.0/adiff 2018-09-02 22:16:15.719533689 +0200
+@@ -0,0 +1,72 @@
++/gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install 
-c -m 644 rpcsvc/bootparam.h 
/gnu/store/jrsyg8lyidcc9jawx98725zyrmjdg1c9-glibc-headers-mesboot-2.16.0/include/rpcsvc/bootparam.h
++make[2]: *** No rule to make target 
`/gnu/store/jrsyg8lyidcc9jawx98725zyrmjdg1c9-glibc-headers-mesboot-2.16.0/include/rpcsvc/bootparam_prot.h',
 needed by `install-headers-nosubdir'.  Stop.
++make[2]: Leaving directory 
`/tmp/guix-build-glibc-headers-mesboot-2.16.0.drv-0/glibc-2.16.0/sunrpc'
++make[1]: *** [sunrpc/install-headers] Error 2
++make[1]: Leaving directory 
`/tmp/guix-build-glibc-headers-mesboot-2.16.0.drv-0/glibc-2.16.0'
++make: *** [install-headers] Error 2
++Backtrace:
++
++
++================================================================================
++
++mv -f 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/login/stamp.oST 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/login/stamp.oS
++make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/login'
++make  subdir=elf -C elf ..=../ subdir_lib
++make[2]: Entering directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/elf'
++Makefile:896: *** 
++make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/elf'
++make[1]: *** [elf/subdir_lib] Error 2
++make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0'
++make: *** [all] Error 2
++>Backtrace:
++
++================================================================================
++
++mkdir 
/tmp/guix-build-glibc-headers-mesboot-2.16.0.drv-0/glibc-2.16.0/build/gnu
++{ \
++ echo '/* This file is automatically generated.';\
++ echo '   It defines macros to allow user program to find the shared'; \
++ echo '   library files which come as part of GNU libc.  */'; \
++ echo '#ifndef __GNU_LIB_NAMES_H'; \
++ echo '#define __GNU_LIB_NAMES_H      1'; \
++ echo ''; \
++  \
++    echo '#if !defined __x86_64__'; (  echo libthread_db=libthread_db.so.1;   
echo libnss_nisplus=libnss_nisplus.so.2;   echo 
libBrokenLocale=libBrokenLocale.so.1;   echo libc=libc.so.6;   echo 
libnss_nis=libnss_nis.so.2;   echo libdl=libdl.so.2;   echo 
libnss_test1=libnss_test1.so.2;   echo libnss_compat=libnss_compat.so.2;   echo 
ld=ld-linux.so.2;   echo libanl=libanl.so.1;   echo libcrypt=libcrypt.so.1;   
echo libgcc_s=libgcc_s.so.1;   echo libresolv=libresolv.so.2;   echo libnss_db= 
[...]
++ echo ''; \
++ echo '#endif /* gnu/lib-names.h */'; \
++} >  
/tmp/guix-build-glibc-headers-mesboot-2.16.0.drv-0/glibc-2.16.0/build/gnu/lib-names.T
++make[1]: /bin/sh: Command not found
++make[1]: *** 
[/tmp/guix-build-glibc-headers-mesboot-2.16.0.drv-0/glibc-2.16.0/build/gnu/lib-names.stmp]
 Error 127
++make[1]: Leaving directory 
`/tmp/guix-build-glibc-headers-mesboot-2.16.0.drv-0/glibc-2.16.0'
++make: *** [install-headers] Error 2
++
++================================================================================
++
++/gnu/store/az6hpmq3v6q48hi9qxg8210a5x2dda3b-binutils-mesboot-2.20.1a/bin/ld: 
errno: TLS reference in 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/malloc/libmemusage_pic.a(memusage.os)
 mismatches non-TLS definition in 
/gnu/store/y3dacmbfh0q14cxdgwhvnd5xzv6vj32r-glibc-mesboot0-2.2.5/lib/libc.a(sysdep.o)
 section .bss
++/gnu/store/y3dacmbfh0q14cxdgwhvnd5xzv6vj32r-glibc-mesboot0-2.2.5/lib/libc.a: 
could not read symbols: Bad value
++collect2: error: ld returned 1 exit status
++make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/malloc/libmemusage.so]
 Error 1
++make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/malloc'
++make[1]: *** [malloc/others] Error 2
++make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0'
++
++================================================================================
++
++/gnu/store/r6nwmhx0r3qka4kqv1cp950270637979-gcc-mesboot-4.7.4/bin/gcc  -I 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/nptl/sysdeps/pthread/bits
 -D BOOTSTRAP_GLIBC=1 -L 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0 -L 
/gnu/store/y3dacmbfh0q14cxdgwhvnd5xzv6vj32r-glibc-mesboot0-2.2.5/lib   
-D_RPC_THREAD_SAFE_ -D_GNU_SOURCE -DIS_IN_build -include 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/config.h 
rpc_main.c \
++      -o 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/sunrpc/cross-rpc_main.o
 -MMD -MP -MF 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/sunrpc/cross-rpc_main.o.dt
 -MT 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/sunrpc/cross-rpc_main.o
 -c
++rpc_main.c:37:19: fatal error: errno.h: No such file or directory
++compilation terminated.
++
++
++================================================================================
++
++/gnu/store/r6nwmhx0r3qka4kqv1cp950270637979-gcc-mesboot-4.7.4/bin/gcc  -I 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/nptl/sysdeps/pthread/bits
 -D BOOTSTRAP_GLIBC=1 -L 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0 -L 
/gnu/store/y3dacmbfh0q14cxdgwhvnd5xzv6vj32r-glibc-mesboot0-2.2.5/lib 
authuxprot.c -c -std=gnu99 -fgnu89-inline  -O2 -Wall -Winline -Wwrite-strings 
-fmerge-all-constants -frounding-math -g -Wstrict-prototypes   -fPIC 
-Wa,-mtune=i686      -D_RPC_THREAD_S [...]
++In file included from 
/gnu/store/y3dacmbfh0q14cxdgwhvnd5xzv6vj32r-glibc-mesboot0-2.2.5/include/rpc/types.h:59:0,
++                 from authuxprot.c:36:
++/gnu/store/y3dacmbfh0q14cxdgwhvnd5xzv6vj32r-glibc-mesboot0-2.2.5/include/stdlib.h:557:6:
 warning: '__malloc__' attribute ignored [-Wattributes]
++authuxprot.c:66:1: error: '__EI_xdr_authunix_parms' aliased to undefined 
symbol '__GI_xdr_authunix_parms'
++make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/sunrpc/authuxprot.os]
 Error 1
++make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/sunrpc'
++make[1]: *** [sunrpc/subdir_lib] Error 2
++make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0'
++make: *** [all] Error 2
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/csu/errno-loc.c 
glibc-2.16.0/csu/errno-loc.c
+--- /home/janneke/src/glibc-2.16.0/csu/errno-loc.c     2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/csu/errno-loc.c       2018-09-02 10:13:18.622488059 +0200
+@@ -25,4 +25,6 @@ __errno_location (void)
+ {
+   return &errno;
+ }
++#if 1 // !BOOTSTRAP_GLIBC
+ libc_hidden_def (__errno_location)
++#endif
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/csu/libc-start.c 
glibc-2.16.0/csu/libc-start.c
+--- /home/janneke/src/glibc-2.16.0/csu/libc-start.c    2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/csu/libc-start.c      2018-09-02 10:13:10.354357777 +0200
+@@ -171,9 +171,11 @@ LIBC_START_MAIN (int (*main) (int, char
+      the standard file descriptors are not opened.  We have to do this
+      only for statically linked applications since otherwise the dynamic
+      loader did the work already.  */
++#if 1 // !BOOTSTRAP_GLIBC
+   if (__builtin_expect (__libc_enable_secure, 0))
+     __libc_check_standard_fds ();
+ #endif
++#endif
+ 
+   /* Call the initializer of the program, if any.  */
+ #ifdef SHARED
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/csu/version.c 
glibc-2.16.0/csu/version.c
+--- /home/janneke/src/glibc-2.16.0/csu/version.c       2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/csu/version.c 2018-09-02 21:03:55.138895249 +0200
+@@ -20,6 +20,18 @@
+ #include <libc-abis.h>
+ #include <gnu/libc-version.h>
+ 
++#if 0
++#if BOOTSTRAP_GLIBC && !defined (NULL)
++#define NULL 0
++typedef unsigned long size_t;
++#endif
++#if !defined (RELEASE)
++#define RELEASE "0"
++#define VERSION "2.3.6"
++#endif
++
++#endif
++
+ static const char __libc_release[] = RELEASE;
+ static const char __libc_version[] = VERSION;
+ 
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/elf/Makefile 
glibc-2.16.0/elf/Makefile
+--- /home/janneke/src/glibc-2.16.0/elf/Makefile        2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/elf/Makefile  2018-09-02 12:54:44.616962543 +0200
+@@ -17,6 +17,8 @@
+ 
+ # Makefile for elf subdirectory of GNU C Library.
+ 
++SHELL := /bin/sh
++
+ subdir                := elf
+ 
+ headers               = elf.h bits/elfclass.h link.h bits/link.h
+@@ -382,7 +384,7 @@ endif
+ 
+ common-ldd-rewrite = -e 'address@hidden@%$(slibdir)/$(rtld-installed-name)%g' 
\
+                    -e 'address@hidden@%$(version)%g'
+-sh-ldd-rewrite = $(common-ldd-rewrite) -e 
'address@hidden@%/bin/sh%g;s/\$$"/"/g'
++sh-ldd-rewrite = $(common-ldd-rewrite) -e 
'address@hidden@%fubar$(SHELL)%g;s/\$$"/"/g'
+ bash-ldd-rewrite = $(common-ldd-rewrite) -e 'address@hidden@%$(BASH)%g' \
+                  -e 'address@hidden@%$(msgcatdir)%g'
+ 
+diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/include/features.h 
glibc-2.16.0/include/features.h
+--- /home/janneke/src/glibc-2.16.0/include/features.h  2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/include/features.h    2018-09-01 18:04:55.982937219 +0200
+@@ -18,6 +18,30 @@
+ #ifndef       _FEATURES_H
+ #define       _FEATURES_H     1
+ 
++#if 0
++#if BOOTSTRAP_GLIBC && !defined (NULL) && !__ASSEMBLER__
++#define NULL 0
++typedef unsigned long size_t;
++typedef short int wchar_t;
++
++// 2.3.6 -- not 2.16.0
++//struct link_map;
++//struct r_scope_elem
++//{
++//  struct link_map **r_list;
++//  unsigned int r_nlist;
++//};
++
++/////////////#include "../../../../iconv/gconv.h"
++
++typedef  long int ptrdiff_t;
++#endif
++
++#if BOOTSTRAP_GLIBC && !defined (offsetof)
++#define offsetof(type, field) ((size_t)&((type *)0)->field)
++#endif
++#endif
++
+ /* These are defined by the user (or the compiler)
+    to specify the desired environment:
+ 
+diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/include/libc-symbols.h 
glibc-2.16.0/include/libc-symbols.h
+--- /home/janneke/src/glibc-2.16.0/include/libc-symbols.h      2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/include/libc-symbols.h        2018-09-02 22:41:00.798467803 
+0200
+@@ -558,9 +558,9 @@ for linking")
+ # define libc_hidden_weak(name) hidden_weak (name)
+ # ifdef LINK_OBSOLETE_RPC
+    /* libc_hidden_nolink_sunrpc should only get used in sunrpc code.  */
+-#  define libc_hidden_nolink_sunrpc(name, version) hidden_def (name)
++#  define libc_hidden_nolink_sunrpc(name, version)
+ # else
+-#  define libc_hidden_nolink_sunrpc(name, version) hidden_nolink (name, libc, 
version)
++#  define libc_hidden_nolink_sunrpc(name, version)
+ # endif
+ # define libc_hidden_ver(local, name) hidden_ver (local, name)
+ # define libc_hidden_data_def(name) hidden_data_def (name)
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Makeconfig 
glibc-2.16.0/Makeconfig
+--- /home/janneke/src/glibc-2.16.0/Makeconfig  2012-06-30 21:12:34.000000000 
+0200
++++ glibc-2.16.0/Makeconfig    2018-09-03 00:00:25.290357414 +0200
+@@ -23,6 +23,9 @@ ifneq (,)
+ This makefile requires GNU Make.
+ endif
+ 
++SHELL := /bin/sh
++export SHELL
++
+ all: # Make this the default goal
+ 
+ ifneq "$(origin +included-Makeconfig)" "file"
+@@ -521,9 +524,9 @@ ifneq ($(have-cc-with-libunwind),yes)
+ else
+   libunwind = -lunwind
+ endif
+-libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed
++libgcc_eh := #-Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed
+ gnulib := -lgcc $(libgcc_eh)
+-static-gnulib := -lgcc -lgcc_eh $(libunwind)
++static-gnulib := -lgcc $(libunwind)
+ libc.so-gnulib := -lgcc
+ endif
+ +preinit = $(addprefix $(csu-objpfx),crti.o)
+@@ -764,6 +767,8 @@ ifndef BUILD_CC
+ BUILD_CC = $(CC)
+ endif
+ 
++$(info Makeconfig SHELL=$(SHELL))
++export SHELL
+ move-if-change = $(SHELL) $(..)scripts/move-if-change
+ 
+ -include $(common-objpfx)sysd-sorted
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Makefile 
glibc-2.16.0/Makefile
+--- /home/janneke/src/glibc-2.16.0/Makefile    2012-06-30 21:12:34.000000000 
+0200
++++ glibc-2.16.0/Makefile      2018-09-02 23:01:10.485803965 +0200
+@@ -22,6 +22,9 @@ ifneq (,)
+ This makefile requires GNU Make.
+ endif
+ 
++SHELL := /bin/sh
++export SHELL
++
+ include Makeconfig
+ 
+ 
+@@ -135,13 +138,10 @@ $(common-objpfx)linkobj/libc.so: $(elfob
+                                $(shlib-lds)
+       $(build-shlib)
+ 
+-$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \
+-                                  $(common-objpfx)sunrpc/librpc_compat_pic.a
++$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a
+       $(..)./scripts/mkinstalldirs $(common-objpfx)linkobj
+       (cd $(common-objpfx)linkobj; \
+        $(AR) x ../libc_pic.a; \
+-       rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \
+-       $(AR) x ../sunrpc/librpc_compat_pic.a; \
+        $(AR) cr libc_pic.a *.os; \
+        rm *.os)
+ endif
+@@ -151,7 +151,7 @@ endif
+ # the current libc build for testing.
+ $(common-objpfx)testrun.sh: $(common-objpfx)config.make \
+                           $(..)Makeconfig $(..)Makefile
+-      (echo '#!/bin/sh'; \
++      (echo '#! $(SHELL)'; \
+        echo 'builddir=`dirname "$$0"`'; \
+        echo 'GCONV_PATH="$${builddir}/iconvdata" \'; \
+        echo 'exec $(subst $(common-objdir),"$${builddir}",\
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Makefile.in 
glibc-2.16.0/Makefile.in
+--- /home/janneke/src/glibc-2.16.0/Makefile.in 2012-06-30 21:12:34.000000000 
+0200
++++ glibc-2.16.0/Makefile.in   2018-09-02 13:03:01.892962551 +0200
+@@ -9,3 +9,6 @@ all .DEFAULT:
+ install:
+       LANGUAGE=C LC_ALL=C; export LANGUAGE LC_ALL; \
+       $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` 
$@
++
++export SHELL
++export BASH
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/malloc/Makefile 
glibc-2.16.0/malloc/Makefile
+--- /home/janneke/src/glibc-2.16.0/malloc/Makefile     2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/malloc/Makefile       2018-09-02 17:11:33.461547394 +0200
+@@ -35,7 +35,7 @@ install-lib := libmcheck.a
+ non-lib.a := libmcheck.a
+ 
+ # Additional library.
+-extra-libs = libmemusage
++extra-libs = #libmemusage
+ extra-libs-others = $(extra-libs)
+ 
+ libmemusage-routines = memusage
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nscd/cache.c 
glibc-2.16.0/nscd/cache.c
+--- /home/janneke/src/glibc-2.16.0/nscd/cache.c        2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/nscd/cache.c  2018-09-02 23:38:31.757616750 +0200
+@@ -74,7 +74,7 @@ struct datahead *
+ cache_search (request_type type, const void *key, size_t len,
+             struct database_dyn *table, uid_t owner)
+ {
+-  unsigned long int hash = __nis_hash (key, len) % table->head->module;
++  unsigned long int hash = 0;
+ 
+   unsigned long int nsearched = 0;
+   struct datahead *result = NULL;
+@@ -153,7 +153,7 @@ cache_add (int type, const void *key, si
+              first ? _(" (first)") : "");
+     }
+ 
+-  unsigned long int hash = __nis_hash (key, len) % table->head->module;
++  unsigned long int hash = 0;
+   struct hashentry *newp;
+ 
+   newp = mempool_alloc (table, sizeof (struct hashentry), 0);
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nscd/Makefile 
glibc-2.16.0/nscd/Makefile
+--- /home/janneke/src/glibc-2.16.0/nscd/Makefile       2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/nscd/Makefile 2018-09-02 23:49:29.948031787 +0200
+@@ -126,9 +126,7 @@ include $(patsubst %,$(..)cppflags-itera
+ $(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o)
+ 
+ ifeq ($(build-shared),yes)
+-$(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) \
+-             $(common-objpfx)nis/libnsl.so
++$(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library)
+ else
+-$(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) \
+-             $(common-objpfx)nis/libnsl.a
++$(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library)
+ endif
+diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/nscd/nscd_helper.c 
glibc-2.16.0/nscd/nscd_helper.c
+--- /home/janneke/src/glibc-2.16.0/nscd/nscd_helper.c  2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/nscd/nscd_helper.c    2018-09-02 23:38:04.941189464 +0200
+@@ -474,7 +474,7 @@ struct datahead *
+ __nscd_cache_search (request_type type, const char *key, size_t keylen,
+                    const struct mapped_database *mapped, size_t datalen)
+ {
+-  unsigned long int hash = __nis_hash (key, keylen) % mapped->head->module;
++  unsigned long int hash = 0;
+   size_t datasize = mapped->datasize;
+ 
+   ref_t trail = mapped->head->array[hash];
+diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/resolv/gethnamaddr.c 
glibc-2.16.0/resolv/gethnamaddr.c
+--- /home/janneke/src/glibc-2.16.0/resolv/gethnamaddr.c        2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/resolv/gethnamaddr.c  2018-09-02 22:16:41.691943346 +0200
+@@ -67,6 +67,7 @@ static char sccsid[] = "@(#)gethostnamad
+ #include <errno.h>
+ #include <syslog.h>
+ 
++
+ #define RESOLVSORT
+ 
+ #ifndef LOG_AUTH
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Rules 
glibc-2.16.0/Rules
+--- /home/janneke/src/glibc-2.16.0/Rules       2012-06-30 21:12:34.000000000 
+0200
++++ glibc-2.16.0/Rules 2018-09-02 10:52:06.927362861 +0200
+@@ -24,6 +24,9 @@ ifneq (,)
+ This makefile requires GNU Make.
+ endif
+ 
++export SHELL
++export BASH
++
+ all: # Don't let the default goal come from Makeconfig.
+ 
+ include $(firstword $(..) ../)Makeconfig
+diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/scripts/gen-as-const.awk 
glibc-2.16.0/scripts/gen-as-const.awk
+--- /home/janneke/src/glibc-2.16.0/scripts/gen-as-const.awk    2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/scripts/gen-as-const.awk      2018-09-01 18:08:37.266516330 
+0200
+@@ -14,6 +14,12 @@ BEGIN { started = 0 }
+ 
+ NF >= 1 && !started {
+   if (test) {
++    print "\n#include <stddef.h>";
++    print "\n#include <stdint.h>";
++#    print "\ntypedef unsigned long size_t;";
++    print "\n#ifndef offsetof";
++    print "\n#define offsetof(type, field) ((size_t)&((type *)0)->field)";
++    print "\n#endif";
+     print "\n#include <inttypes.h>";
+     print "\n#include <stdio.h>";
+     print "\n#include <bits/wordsize.h>";
+@@ -33,8 +39,15 @@ NF >= 1 && !started {
+       " source, #name, U (asconst_##name), #expr, (c_t) (expr));" \
+       " } else ++good;\n";
+   }
+-  else
++  else {
++    print "\n#include <stddef.h>";
++    print "\n#include <stdint.h>";
++#    print "\ntypedef unsigned long size_t;";
++    print "\n#ifndef offsetof";
++    print "\n#define offsetof(type, field) ((size_t)&((type *)0)->field)";
++    print "\n#endif";
+     print "void dummy(void) {";
++  }
+   started = 1;
+ }
+ 
+diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/sunrpc/auth_none.c 
glibc-2.16.0/sunrpc/auth_none.c
+--- /home/janneke/src/glibc-2.16.0/sunrpc/auth_none.c  2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/sunrpc/auth_none.c    2018-09-02 22:09:21.629007932 +0200
+@@ -95,7 +95,9 @@ authnone_create (void)
+   __libc_once (authnone_private_guard, authnone_create_once);
+   return &authnone_private.no_client;
+ }
++#if !BOOTSTRAP_GLIBC
+ libc_hidden_nolink_sunrpc (authnone_create, GLIBC_2_0)
++#endif
+ 
+ static bool_t
+ authnone_marshal (AUTH *client, XDR *xdrs)
+diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/sunrpc/authuxprot.c 
glibc-2.16.0/sunrpc/authuxprot.c
+--- /home/janneke/src/glibc-2.16.0/sunrpc/authuxprot.c 2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/sunrpc/authuxprot.c   2018-09-02 22:15:51.927158451 +0200
+@@ -63,4 +63,6 @@ xdr_authunix_parms (XDR * xdrs, struct a
+     }
+   return FALSE;
+ }
++#if !BOOTSTRAP_GLIBC
+ libc_hidden_nolink_sunrpc (xdr_authunix_parms, GLIBC_2_0)
++#endif
+diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/sunrpc/bindrsvprt.c 
glibc-2.16.0/sunrpc/bindrsvprt.c
+--- /home/janneke/src/glibc-2.16.0/sunrpc/bindrsvprt.c 2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/sunrpc/bindrsvprt.c   2018-09-02 22:24:32.687187675 +0200
+@@ -96,4 +96,7 @@ bindresvport (int sd, struct sockaddr_in
+ 
+   return res;
+ }
++#if !BOOTSTRAP_GLIBC
+ libc_hidden_def (bindresvport)
++#endif
++
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/clnt_raw.c 
glibc-2.16.0/sunrpc/clnt_raw.c
+--- /home/janneke/src/glibc-2.16.0/sunrpc/clnt_raw.c   2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/sunrpc/clnt_raw.c     2018-09-02 22:33:21.151343826 +0200
+@@ -40,6 +40,7 @@
+ #include <rpc/svc.h>
+ #include <rpc/xdr.h>
+ #include <libintl.h>
++#include <stddef.h>
+ 
+ #define MCALL_MSG_SIZE 24
+ 
+@@ -129,7 +130,9 @@ clntraw_create (u_long prog, u_long vers
+   client->cl_auth = authnone_create ();
+   return client;
+ }
++#if !BOOTSTRAP_GLIBC
+ libc_hidden_nolink_sunrpc (clntraw_create, GLIBC_2_0)
++#endif
+ 
+ static enum clnt_stat
+ clntraw_call (h, proc, xargs, argsp, xresults, resultsp, timeout)
+diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/sunrpc/clnt_simp.c 
glibc-2.16.0/sunrpc/clnt_simp.c
+--- /home/janneke/src/glibc-2.16.0/sunrpc/clnt_simp.c  2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/sunrpc/clnt_simp.c    2018-09-02 22:34:14.884175251 +0200
+@@ -139,7 +139,9 @@ callrpc (const char *host, u_long prognu
+     crp->valid = 0;
+   return (int) clnt_stat;
+ }
++#if !BOOTSTRAP_GLIBC
+ libc_hidden_nolink_sunrpc (callrpc, GLIBC_2_0)
++#endif
+ 
+ #ifdef _RPC_THREAD_SAFE_
+ void
diff --git a/gnu/packages/patches/glibc-boot-2.3.6.patch 
b/gnu/packages/patches/glibc-boot-2.3.6.patch
deleted file mode 100644
index ca30b39..0000000
--- a/gnu/packages/patches/glibc-boot-2.3.6.patch
+++ /dev/null
@@ -1,856 +0,0 @@
-diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.3.6/adiff 
glibc-2.3.6/adiff
---- /home/janneke/src/glibc-2.3.6/adiff        1970-01-01 01:00:00.000000000 
+0100
-+++ glibc-2.3.6/adiff  2018-08-29 20:10:22.419618803 +0200
-@@ -0,0 +1,559 @@
-+/gnu/store/a1x6gzn1cxfqkdfwr5wffj94y82ap4a8-gcc-mesboot-4.1.0/bin/gcc  -L 
/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6 
../sysdeps/i386/fpu/ftestexcept.c -c -std=gnu99 -O2 -Wall -Winline 
-Wstrict-prototypes -Wwrite-strings -g -mpreferred-stack-boundary=4    
-Wno-uninitialized -D__NO_MATH_INLINES -D__LIBC_INTERNAL_MATH_INLINES 
-I../include -I. 
-I/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/math -I.. 
-I../libio  -I/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3. [...]
-+/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/ccqwCpqh.s: Assembler messages:
-+/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/ccqwCpqh.s:30: Error: suffix or 
operands invalid for `fnstsw'
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/sysd-rules:1072: 
/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/math/ftestexcept.o] 
Error 1
-+
-+================================================================================
-+
-+/gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install 
-c -m 644 rpcsvc/bootparam.h 
/gnu/store/3slhzsd7w18s8j74lsv0spa24dw43nsz-glibc-mesboot-2.3.6/include/rpcsvc/bootparam.h
-+make[2]: *** No rule to make target `rpcsvc/bootparam_prot.h', needed by 
`/gnu/store/3slhzsd7w18s8j74lsv0spa24dw43nsz-glibc-mesboot-2.3.6/include/rpcsvc/bootparam_prot.h'.
  Stop.
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/sunrpc'
-+make[1]: *** [sunrpc/install-headers] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-+make: *** [install-headers] Error 2
-+
-+================================================================================
-+
-+../sysdeps/generic/ldsodefs.h:248:3: warning: type defaults to 'int' in type 
name [enabled by default]
-+../sysdeps/generic/ldsodefs.h:248:3: error: storage class specified for 
unnamed parameter
-+../sysdeps/generic/ldsodefs.h:248:41: error: unknown type name '_dl_load_lock'
-+In file included from ../sysdeps/unix/sysv/linux/ldsodefs.h:25:0,
-+                 from ../sysdeps/unix/sysv/linux/init-first.c:30:
-+../sysdeps/generic/ldsodefs.h:673:6: error: unknown type name 'Lmid_t'
-+../sysdeps/generic/ldsodefs.h:697:6: error: unknown type name 'Dl_serinfo'
-+../sysdeps/generic/ldsodefs.h:738:16: error: unknown type name 'Lmid_t'
-+../sysdeps/unix/sysv/linux/init-first.c: In function 'init':
-+../sysdeps/unix/sysv/linux/init-first.c:63:2: warning: implicit declaration 
of function '__setfpucw' [-Wimplicit-function-declaration]
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.4.drv-0/glibc-2.3.4/build/csu/init-first.o] 
Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.4.drv-0/glibc-2.3.4/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.4.drv-0/glibc-2.3.4'
-+make: *** [install] Error 2
-+
-+================================================================================
-+
-+In file included from 
/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/_G_config.h:44:0,
-+                 from 
/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/libio.h:32,
-+                 from 
/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/stdio.h:72,
-+                 from ../sysdeps/unix/sysv/linux/init-first.c:20:
-+/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/gconv.h:72:26:
 error: unknown type name 'size_t'
-+/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/gconv.h:88:7:
 error: unknown type name 'size_t'
-+/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/gconv.h:97:6:
 error: unknown type name 'size_t'
-+/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/gconv.h:106:3:
 error: unknown type name '__gconv_trans_fct'
-+/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/gconv.h:125:3:
 error: unknown type name '__gconv_fct'
-+/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/gconv.h:174:3:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/rxavf0v67z3nbdb225qg61flw4ndgba9-glibc-headers-mesboot-2.3.6/include/stdio.h:72:0,
-+                 from ../sysdeps/unix/sysv/linux/init-first.c:20:
-+
-+================================================================================
-+
-+In file included from ../sysdeps/unix/sysv/linux/ldsodefs.h:25:0,
-+                 from ../sysdeps/unix/sysv/linux/init-first.c:36:
-+../sysdeps/unix/sysv/linux/init-first.c: At top level:
-+../sysdeps/generic/ldsodefs.h:408:30: error: storage size of 
'_dl_initial_searchlist' isn't known
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/csu/init-first.o] 
Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-+make: *** [all] Error 2
-+Backtrace:
-+
-+================================================================================
-+
-+/gnu/store/mzqdf9mx9p5mh0i6jmi3j0cr792as5xm-gcc-mesboot-4.7.4/bin/gcc  -I 
/gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/include -I 
/gnu/store/5lbd6awbs4cmqa6ahi8rh63iwxmxic9d-glibc-headers-mesboot-2.3.6/include 
-I 
/gnu/store/77zwwy19kkpkf0ridbrldnpchld15gd8-linux-libre-headers-bootstrap-0/include/linux
 -D BOOTSTRAP_GLIBC=1 -L /tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6 
-L /gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/lib 
../sysdeps/generic [...]
-+In file included from ../sysdeps/generic/libc-start.c:19:0:
-+/gnu/store/5lbd6awbs4cmqa6ahi8rh63iwxmxic9d-glibc-headers-mesboot-2.3.6/include/stdlib.h:140:1:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/libc-start.c:19:0:
-+/gnu/store/5lbd6awbs4cmqa6ahi8rh63iwxmxic9d-glibc-headers-mesboot-2.3.6/include/stdlib.h:
 In function 'atof':
-+/gnu/store/5lbd6awbs4cmqa6ahi8rh63iwxmxic9d-glibc-headers-mesboot-2.3.6/include/stdlib.h:394:36:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/5lbd6awbs4cmqa6ahi8rh63iwxmxic9d-glibc-headers-mesboot-2.3.6/include/stdlib.h:394:36:
 note: each undeclared identifier is reported only once for each function it 
appears in
-+
-+================================================================================
-+
-+../sysdeps/generic/libc-start.c: In function '__libc_start_main':
-+../sysdeps/generic/libc-start.c:141:7: warning: implicit declaration of 
function '__uname' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:141:7: warning: implicit declaration of 
function '__open' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:141:7: warning: implicit declaration of 
function '__read' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:141:7: warning: implicit declaration of 
function '__libc_fatal' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:141:7: warning: implicit declaration of 
function '__close' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:158:5: warning: implicit declaration of 
function '__cxa_atexit' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:176:25: error: '__libc_enable_secure' 
undeclared (first use in this function)
-+../sysdeps/generic/libc-start.c:176:25: note: each undeclared identifier is 
reported only once for each function it appears in
-+../sysdeps/generic/libc-start.c:177:5: warning: implicit declaration of 
function '__libc_check_standard_fds' [-Wimplicit-function-declaration]
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/csu/libc-start.o] 
Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-+make: *** [all] Error 2
-+
-+================================================================================
-+
-+../sysdeps/generic/libc-start.c: In function '__libc_start_main':
-+../sysdeps/generic/libc-start.c:142:7: warning: implicit declaration of 
function '__uname' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:142:7: warning: implicit declaration of 
function '__open' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:142:7: warning: implicit declaration of 
function '__read' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:142:7: warning: implicit declaration of 
function '__libc_fatal' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:142:7: warning: implicit declaration of 
function '__close' [-Wimplicit-function-declaration]
-+../sysdeps/generic/libc-start.c:159:5: warning: implicit declaration of 
function '__cxa_atexit' [-Wimplicit-function-declaration]
-+In file included from ../sysdeps/unix/sysv/linux/ldsodefs.h:25:0,
-+                 from ../sysdeps/generic/libc-start.c:29:
-+../sysdeps/generic/libc-start.c: At top level:
-+../sysdeps/generic/ldsodefs.h:408:30: error: storage size of 
'_dl_initial_searchlist' isn't known
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/csu/libc-start.o] 
Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-+make: *** [all] Error 2
-+
-+================================================================================
-+
-+/gnu/store/mzqdf9mx9p5mh0i6jmi3j0cr792as5xm-gcc-mesboot-4.7.4/bin/gcc  -I 
/gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/include -I 
/gnu/store/jm9dmd9x7p16nl3j7v3nrn9m2y4ar8r7-glibc-headers-mesboot-2.3.6/include 
-I 
/gnu/store/77zwwy19kkpkf0ridbrldnpchld15gd8-linux-libre-headers-bootstrap-0/include/linux
 -D BOOTSTRAP_GLIBC=1 -L /tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6 
-L /gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/lib 
version.c -c -std= [...]
-+version.c:23:38: error: 'RELEASE' undeclared here (not in a function)
-+version.c:24:38: error: 'VERSION' undeclared here (not in a function)
-+version.c:24:1: error: invalid initializer
-+version.c:27:17: error: expected ',' or ';' before 'RELEASE'
-+In file included from version.c:43:0:
-+/gnu/store/jm9dmd9x7p16nl3j7v3nrn9m2y4ar8r7-glibc-headers-mesboot-2.3.6/include/unistd.h:312:45:
 error: unknown type name 'size_t'
-+/gnu/store/jm9dmd9x7p16nl3j7v3nrn9m2y4ar8r7-glibc-headers-mesboot-2.3.6/include/unistd.h:318:54:
 error: unknown type name 'size_t'
-+
-+================================================================================
-+
-+/gnu/store/mzqdf9mx9p5mh0i6jmi3j0cr792as5xm-gcc-mesboot-4.7.4/bin/gcc  -I 
/gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/include -I 
/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include 
-I 
/gnu/store/77zwwy19kkpkf0ridbrldnpchld15gd8-linux-libre-headers-bootstrap-0/include/linux
 -D BOOTSTRAP_GLIBC=1 -L /tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6 
-L /gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/lib 
../sysdeps/generic [...]
-+In file included from 
/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/fcntl.h:33:0,
-+                 from ../sysdeps/generic/check_fds.c:20:
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/bits/fcntl.h:186:57:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/check_fds.c:22:0:
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:312:45:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:318:54:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:328:46:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:336:55:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:356:48:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:360:57:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:448:35:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/check_fds.c:22:0:
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:544:1:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:544:49:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:712:46:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:740:8:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:769:38:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/check_fds.c:22:0:
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:791:39:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:798:47:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:809:41:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:811:49:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:829:57:
 error: unknown type name 'size_t'
-+/gnu/store/yj4g6899rsaxp7bnias33xbm0npi41sj-glibc-headers-mesboot-2.3.6/include/unistd.h:830:6:
 error: unknown type name 'size_t'
-+../sysdeps/generic/check_fds.c: In function 'check_one_fd':
-+../sysdeps/generic/check_fds.c:44:3: warning: implicit declaration of 
function '__libc_fcntl' [-Wimplicit-function-declaration]
-+../sysdeps/generic/check_fds.c:52:7: warning: implicit declaration of 
function '__set_errno' [-Wimplicit-function-declaration]
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/csu/check_fds.o] 
Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-+make: *** [all] Error 2
-+
-+================================================================================
-+
-+/gnu/store/mzqdf9mx9p5mh0i6jmi3j0cr792as5xm-gcc-mesboot-4.7.4/bin/gcc  -I 
/gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/include -I 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include 
-I 
/gnu/store/77zwwy19kkpkf0ridbrldnpchld15gd8-linux-libre-headers-bootstrap-0/include/linux
 -D BOOTSTRAP_GLIBC=1 -L /tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6 
-L /gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/lib 
../sysdeps/generic [...]
-+In file included from ../sysdeps/generic/ldsodefs.h:29:0,
-+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:39:40:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:43:58:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:52:18:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:59:42:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:62:60:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:66:50:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:77:51:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:88:41:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:96:9:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:102:61:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:109:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:110:42:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/ldsodefs.h:29:0,
-+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:124:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:124:61:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:138:47:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:184:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:188:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:225:48:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:226:32:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:232:36:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:235:41:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:242:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:249:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:249:48:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:281:53:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:288:33:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:292:55:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:296:31:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:299:58:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:329:65:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:341:6:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:370:36:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:373:41:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:380:34:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:417:0,
-+                 from ../sysdeps/generic/ldsodefs.h:29,
-+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:969:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:971:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strcspn_c1':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:973:3:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:979:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:982:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strcspn_c2':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:984:3:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:991:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:994:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strcspn_c3':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:997:3:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1045:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1047:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strspn_c1':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1049:3:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1056:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1059:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strspn_c2':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1061:3:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1068:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1071:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strspn_c3':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1073:3:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strpbrk_c2':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1129:25:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1129:25:
 note: each undeclared identifier is reported only once for each function it 
appears in
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1129:42:
 error: 'size_t' undeclared (first use in this function)
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1129:50:
 error: expected ';' before '__s'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strpbrk_c3':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1142:25:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1142:42:
 error: 'size_t' undeclared (first use in this function)
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1142:50:
 error: expected ';' before '__s'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strtok_r_1c':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1178:14:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strsep_1c':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1228:19:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strsep_2c':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1238:19:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strsep_3c':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1266:19:
 error: 'NULL' undeclared (first use in this function)
-+In file included from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1299:0,
-+                 from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:417,
-+                 from ../sysdeps/generic/ldsodefs.h:29,
-+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdlib.h:
 At top level:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdlib.h:584:22:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdlib.h:586:22:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdlib.h:586:38:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:417:0,
-+                 from ../sysdeps/generic/ldsodefs.h:29,
-+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1323:49:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/ldsodefs.h:32:0,
-+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/dlfcn.h:166:3:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/ldsodefs.h:34:0,
-+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:58:34:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:71:36:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:77:34:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:82:36:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:90:33:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:95:35:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:99:41:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:104:41:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:107:43:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:122:36:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:122:54:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:130:36:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:135:45:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/sys/mman.h:136:9:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/ldsodefs.h:35:0,
-+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/link.h:118:11:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/link.h:119:8:
 error: expected ';', ',' or ')' before 'void'
-+In file included from ../sysdeps/unix/sysv/linux/ldsodefs.h:25:0,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+../sysdeps/generic/ldsodefs.h:158:5: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:166:5: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:244:5: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:399:10: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:405:10: error: unknown type name 'size_t'
-+In file included from ../sysdeps/unix/sysv/linux/ldsodefs.h:25:0,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+../sysdeps/generic/ldsodefs.h:794:7: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:836:8: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:837:8: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:838:8: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:855:60: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:874:1: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:890:38: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:890:53: error: unknown type name 'size_t'
-+../sysdeps/generic/ldsodefs.h:915:1: error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/libc-tls.c:23:0:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:312:45:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:318:54:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:328:46:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:336:55:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:356:48:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:360:57:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:448:35:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/libc-tls.c:23:0:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:544:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:544:49:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:712:46:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:740:8:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:769:38:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/generic/libc-tls.c:23:0:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:791:39:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:798:47:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:809:41:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:811:49:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:829:57:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/unistd.h:830:6:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/_G_config.h:44:0,
-+                 from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:32,
-+                 from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:72,
-+                 from ../sysdeps/generic/libc-tls.c:24:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/gconv.h:72:26:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/gconv.h:88:7:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/gconv.h:97:6:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/gconv.h:106:3:
 error: unknown type name '__gconv_trans_fct'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/gconv.h:125:3:
 error: unknown type name '__gconv_fct'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/gconv.h:174:3:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:72:0,
-+                 from ../sysdeps/generic/libc-tls.c:24:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:218:11:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:219:11:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:220:11:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:228:25:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:229:10:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:229:21:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:233:38:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:243:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:244:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:245:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:246:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:247:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:248:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:249:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:250:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:252:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:253:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:255:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:261:3:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:354:62:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:363:6:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:379:1:
 error: unknown type name '__io_read_fn'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:380:1:
 error: unknown type name '__io_write_fn'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:387:3:
 error: unknown type name '__io_read_fn'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:388:3:
 error: unknown type name '__io_write_fn'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:479:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:479:50:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:488:30:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:523:1:
 error: unknown type name 'wchar_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/libio.h:525:1:
 error: unknown type name 'wchar_t'
-+In file included from ../sysdeps/generic/libc-tls.c:24:0:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:284:35:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:290:9:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:302:20:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:309:10:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:351:44:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:355:45:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:560:11:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:563:9:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:573:8:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:603:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:603:46:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:604:8:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:609:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:609:55:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:610:9:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:631:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:631:55:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:632:10:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:633:1:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:633:64:
 error: unknown type name 'size_t'
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:634:11:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/stdio.h:828:0,
-+                 from ../sysdeps/generic/libc-tls.c:24:
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/stdio.h:102:28:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/string.h:417:0,
-+                 from ../sysdeps/generic/ldsodefs.h:29,
-+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
-+                 from ../sysdeps/generic/libc-tls.c:21:
-+../sysdeps/generic/libc-tls.c: In function '__strpbrk_c3':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1143:1:
 warning: control reaches end of non-void function [-Wreturn-type]
-+../sysdeps/generic/libc-tls.c: In function '__strpbrk_c2':
-+/gnu/store/g708dx1d4bhclw5v84gashyvrlf4sh15-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1130:1:
 warning: control reaches end of non-void function [-Wreturn-type]
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/csu/libc-tls.o] 
Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-+make: *** [all] Error 2
-+
-+================================================================================
-+
-+/gnu/store/mzqdf9mx9p5mh0i6jmi3j0cr792as5xm-gcc-mesboot-4.7.4/bin/gcc  -I 
/gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/include -I 
/gnu/store/52s8rsfqi4c2pj8700qgy5zjp2495hqi-glibc-headers-mesboot-2.3.6/include 
-I 
/gnu/store/77zwwy19kkpkf0ridbrldnpchld15gd8-linux-libre-headers-bootstrap-0/include/linux
 -D BOOTSTRAP_GLIBC=1 -L /tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6 
-L /gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/lib 
elf-init.c -c -std [...]
-+elf-init.c: In function '__libc_csu_init':
-+elf-init.c:69:5: error: unknown type name 'size_t'
-+elf-init.c:70:5: error: unknown type name 'size_t'
-+elf-init.c:81:5: error: unknown type name 'size_t'
-+elf-init.c:82:5: error: unknown type name 'size_t'
-+elf-init.c: In function '__libc_csu_fini':
-+elf-init.c:93:3: error: unknown type name 'size_t'
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/csu/elf-init.o] 
Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-+make: *** [all] Error 2
-+
-+================================================================================
-+
-+/gnu/store/mzqdf9mx9p5mh0i6jmi3j0cr792as5xm-gcc-mesboot-4.7.4/bin/gcc  -I 
/gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/include -I 
/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include 
-I 
/gnu/store/77zwwy19kkpkf0ridbrldnpchld15gd8-linux-libre-headers-bootstrap-0/include/linux
 -D BOOTSTRAP_GLIBC=1 -L /tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6 
-L /gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/lib 
../sysdeps/i386/i6 [...]
-+In file included from ../sysdeps/i386/i686/hp-timing.h:24:0,
-+                 from ../sysdeps/i386/i686/hp-timing.c:21:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:39:40:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:43:58:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:52:18:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:59:42:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:62:60:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:66:50:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:77:51:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:88:41:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:96:9:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:102:61:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:109:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:110:42:
 error: unknown type name 'size_t'
-+In file included from ../sysdeps/i386/i686/hp-timing.h:24:0,
-+                 from ../sysdeps/i386/i686/hp-timing.c:21:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:124:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:124:61:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:138:47:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:184:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:188:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:225:48:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:226:32:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:232:36:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:235:41:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:242:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:249:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:249:48:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:281:53:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:288:33:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:292:55:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:296:31:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:299:58:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:329:65:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:341:6:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:370:36:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:373:41:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:380:34:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:417:0,
-+                 from ../sysdeps/i386/i686/hp-timing.h:24,
-+                 from ../sysdeps/i386/i686/hp-timing.c:21:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:969:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:971:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strcspn_c1':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:973:3:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:979:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:982:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strcspn_c2':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:984:3:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:991:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:994:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strcspn_c3':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:997:3:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1045:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1047:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strspn_c1':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1049:3:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1056:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1059:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strspn_c2':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1061:3:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 At top level:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1068:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1071:1:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strspn_c3':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1073:3:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strpbrk_c2':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1129:25:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1129:25:
 note: each undeclared identifier is reported only once for each function it 
appears in
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1129:42:
 error: 'size_t' undeclared (first use in this function)
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1129:50:
 error: expected ';' before '__s'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strpbrk_c3':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1142:25:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1142:42:
 error: 'size_t' undeclared (first use in this function)
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1142:50:
 error: expected ';' before '__s'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strtok_r_1c':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1178:14:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strsep_1c':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1228:19:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strsep_2c':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1238:19:
 error: 'NULL' undeclared (first use in this function)
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:
 In function '__strsep_3c':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1266:19:
 error: 'NULL' undeclared (first use in this function)
-+In file included from 
/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1299:0,
-+                 from 
/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:417,
-+                 from ../sysdeps/i386/i686/hp-timing.h:24,
-+                 from ../sysdeps/i386/i686/hp-timing.c:21:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/stdlib.h:
 At top level:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/stdlib.h:584:22:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/stdlib.h:586:22:
 error: unknown type name 'size_t'
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/stdlib.h:586:38:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:417:0,
-+                 from ../sysdeps/i386/i686/hp-timing.h:24,
-+                 from ../sysdeps/i386/i686/hp-timing.c:21:
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1323:49:
 error: unknown type name 'size_t'
-+In file included from 
/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/string.h:417:0,
-+                 from ../sysdeps/i386/i686/hp-timing.h:24,
-+                 from ../sysdeps/i386/i686/hp-timing.c:21:
-+../sysdeps/i386/i686/hp-timing.c: In function '__strpbrk_c3':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1143:1:
 warning: control reaches end of non-void function [-Wreturn-type]
-+../sysdeps/i386/i686/hp-timing.c: In function '__strpbrk_c2':
-+/gnu/store/a6zf2ga0ha4hmzgpg0pdmw74svc0rmbb-glibc-headers-mesboot-2.3.6/include/bits/string2.h:1130:1:
 warning: control reaches end of non-void function [-Wreturn-type]
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/csu/hp-timing.o] 
Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-+make: *** [all] Error 2
-+
-+================================================================================
-+
-+/gnu/store/mzqdf9mx9p5mh0i6jmi3j0cr792as5xm-gcc-mesboot-4.7.4/bin/gcc  -I 
/gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/include -I 
/gnu/store/2l8skqqnvhzaf3aq121291ml0k9kg8xm-glibc-headers-mesboot-2.3.6/include 
-I 
/gnu/store/77zwwy19kkpkf0ridbrldnpchld15gd8-linux-libre-headers-bootstrap-0/include/linux
 -D BOOTSTRAP_GLIBC=1 -L /tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6 
-L /gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/lib 
../sysdeps/generic [...]
-+../sysdeps/generic/errno-loc.c:37:1: error: '__EI___errno_location' aliased 
to undefined symbol '__GI___errno_location'
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/csu/errno-loc.os] 
Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-+make: *** [all] Error 2
-+Backtrace:
-+
-+================================================================================
-+
-+/gnu/store/mzqdf9mx9p5mh0i6jmi3j0cr792as5xm-gcc-mesboot-4.7.4/bin/gcc  -I 
/gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/include -I 
/gnu/store/3g0nmf72lxamma5j6i39zxja1hp401j8-glibc-headers-mesboot-2.3.6/include 
-I 
/gnu/store/77zwwy19kkpkf0ridbrldnpchld15gd8-linux-libre-headers-bootstrap-0/include/linux
 -D BOOTSTRAP_GLIBC=1 -L /tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6 
-L /gnu/store/336rc1z1smymlwdph6kdlkqf5s8z6nvd-glibc-mesboot0-2.2.5/lib 
/tmp/guix-build-gl [...]
-+../sysdeps/generic/initfini.c: Assembler messages:
-+../sysdeps/generic/initfini.c:135: Error: open CFI at the end of file; 
missing .cfi_endproc directive
-+../sysdeps/generic/initfini.c:135: Error: open CFI at the end of file; 
missing .cfi_endproc directive
-+make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/build/csu/crti.o] Error 1
-+make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6/csu'
-+make[1]: *** [csu/subdir_lib] Error 2
-+make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.3.6.drv-0/glibc-2.3.6'
-diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.3.6/csu/elf-init.c 
glibc-2.3.6/csu/elf-init.c
---- /home/janneke/src/glibc-2.3.6/csu/elf-init.c       2004-08-16 
06:51:00.000000000 +0200
-+++ glibc-2.3.6/csu/elf-init.c 2018-08-29 19:52:17.591623149 +0200
-@@ -34,6 +34,11 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#if BOOTSTRAP_GLIBC && !defined (NULL)
-+typedef unsigned long size_t;
-+#define NULL 0
-+#endif
-+
- #include <stddef.h>
- 
- #ifdef HAVE_INITFINI_ARRAY
-diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.3.6/csu/version.c 
glibc-2.3.6/csu/version.c
---- /home/janneke/src/glibc-2.3.6/csu/version.c        2005-02-16 
11:29:36.000000000 +0100
-+++ glibc-2.3.6/csu/version.c  2018-08-29 19:53:03.240287907 +0200
-@@ -16,6 +16,15 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#if BOOTSTRAP_GLIBC && !defined (NULL)
-+#define NULL 0
-+typedef unsigned long size_t;
-+#endif
-+#if !defined (RELEASE)
-+#define RELEASE "0"
-+#define VERSION "2.3.6"
-+#endif
-+
- #include "version.h"
- #include <tls.h>
- #include <gnu/libc-version.h>
-diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.3.6/elf/Makefile 
glibc-2.3.6/elf/Makefile
---- /home/janneke/src/glibc-2.3.6/elf/Makefile 2005-07-18 03:19:48.000000000 
+0200
-+++ glibc-2.3.6/elf/Makefile   2018-07-03 14:48:35.140465972 +0200
-@@ -285,7 +285,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld
-                 $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 |      \
-                 LC_ALL=C \
-                 sed -e '/^=========/,/^=========/!d;/^=========/d'    \
--                    -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - 
SIZEOF_HEADERS;/' \
-+                    -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - 
SIZEOF_HEADERS;/' \
-                 > address@hidden
-       $(LINK.o) -nostdlib -nostartfiles -shared -o $@                 \
-                 $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now))      \
-diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.3.6/iconv/gconv.h 
glibc-2.3.6/iconv/gconv.h
---- /home/janneke/src/glibc-2.3.6/iconv/gconv.h        2002-12-02 
22:44:26.000000000 +0100
-+++ glibc-2.3.6/iconv/gconv.h  2018-08-29 19:59:51.278260657 +0200
-@@ -23,6 +23,19 @@
- #ifndef _GCONV_H
- #define _GCONV_H      1
- 
-+#if BOOTSTRAP_GLIBC && !defined (NULL)
-+#define NULL 0
-+typedef unsigned long size_t;
-+typedef short int wchar_t;
-+
-+struct link_map;
-+struct r_scope_elem
-+{
-+  struct link_map **r_list;
-+  unsigned int r_nlist;
-+};
-+#endif
-+
- #include <features.h>
- #define __need_mbstate_t
- #include <wchar.h>
-diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.3.6/manual/Makefile 
glibc-2.3.6/manual/Makefile
---- /home/janneke/src/glibc-2.3.6/manual/Makefile      2004-03-18 
23:26:32.000000000 +0100
-+++ glibc-2.3.6/manual/Makefile        2018-07-03 14:48:35.140465972 +0200
-@@ -233,7 +233,11 @@ ifdef objpfx
- .PHONY: stubs
- stubs: $(objpfx)stubs
- endif
--$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
-+po/manual.pot $(objpfx)stubs:
-+      $(make-target-directory)
-+      touch $@
-+
-+$(objpfx)stamp%:
-       $(make-target-directory)
-       touch $@
- 
-diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.3.6/stdlib/stdlib.h 
glibc-2.3.6/stdlib/stdlib.h
---- /home/janneke/src/glibc-2.3.6/stdlib/stdlib.h      2005-07-18 
03:15:30.000000000 +0200
-+++ glibc-2.3.6/stdlib/stdlib.h        2018-08-29 19:56:44.643512729 +0200
-@@ -22,6 +22,21 @@
- 
- #ifndef       _STDLIB_H
- 
-+#if BOOTSTRAP_GLIBC && !defined (NULL)
-+#define NULL 0
-+typedef unsigned long size_t;
-+typedef short int wchar_t;
-+
-+struct link_map;
-+struct r_scope_elem
-+{
-+  struct link_map **r_list;
-+  unsigned int r_nlist;
-+};
-+
-+/////////////#include "../../../../iconv/gconv.h"
-+#endif
-+
- #include <features.h>
- 
- /* Get size_t, wchar_t and NULL from <stddef.h>.  */
-diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.3.6/sunrpc/Makefile 
glibc-2.3.6/sunrpc/Makefile
---- /home/janneke/src/glibc-2.3.6/sunrpc/Makefile      2005-07-18 
05:03:49.000000000 +0200
-+++ glibc-2.3.6/sunrpc/Makefile        2018-08-29 10:14:07.202492561 +0200
-@@ -98,7 +98,7 @@ otherlibs += $(nssobjdir)/libnss_files.a
-            $(resolvobjdir)/libresolv.a
- endif
- 
--ifeq (no,$(cross-compiling))
-+ifeq (no-never,$(cross-compiling))
- # We can only build this library if we can run the rpcgen we build.
- headers += $(rpcsvc:%.x=rpcsvc/%.h)
- extra-libs := librpcsvc
-diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.3.6/sysdeps/generic/check_fds.c 
glibc-2.3.6/sysdeps/generic/check_fds.c
---- /home/janneke/src/glibc-2.3.6/sysdeps/generic/check_fds.c  2003-04-23 
03:54:03.000000000 +0200
-+++ glibc-2.3.6/sysdeps/generic/check_fds.c    2018-08-29 19:52:39.319939563 
+0200
-@@ -16,6 +16,11 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#if BOOTSTRAP_GLIBC && !defined (NULL)
-+#define NULL 0
-+typedef unsigned long size_t;
-+#endif
-+
- #include <errno.h>
- #include <fcntl.h>
- #include <paths.h>
-diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.3.6/sysdeps/generic/errno-loc.c 
glibc-2.3.6/sysdeps/generic/errno-loc.c
---- /home/janneke/src/glibc-2.3.6/sysdeps/generic/errno-loc.c  2004-10-14 
18:13:17.000000000 +0200
-+++ glibc-2.3.6/sysdeps/generic/errno-loc.c    2018-08-29 19:31:57.970114929 
+0200
-@@ -34,4 +34,6 @@ __errno_location (void)
- {
-   return &errno;
- }
-+#if !BOOTSTRAP_GLIBC
- libc_hidden_def (__errno_location)
-+#endif
-diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.3.6/sysdeps/generic/initfini.c 
glibc-2.3.6/sysdeps/generic/initfini.c
---- /home/janneke/src/glibc-2.3.6/sysdeps/generic/initfini.c   2004-08-16 
06:50:53.000000000 +0200
-+++ glibc-2.3.6/sysdeps/generic/initfini.c     2018-08-29 20:12:23.921418493 
+0200
-@@ -129,6 +129,7 @@ _fini (void)
-   asm ("\n/address@hidden/");
-   SECTION (".fini");
- }
-+asm ("\n.cfi_endproc\n");
- asm ("END_FINI");
- 
- /* End of the _fini epilog.  Any further generated assembly (e.g. .ident)
-diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.3.6/sysdeps/generic/ldsodefs.h 
glibc-2.3.6/sysdeps/generic/ldsodefs.h
---- /home/janneke/src/glibc-2.3.6/sysdeps/generic/ldsodefs.h   2005-04-06 
04:50:21.000000000 +0200
-+++ glibc-2.3.6/sysdeps/generic/ldsodefs.h     2018-08-29 18:35:59.615198000 
+0200
-@@ -39,6 +39,12 @@
- #include <hp-timing.h>
- #include <tls.h>
- 
-+#if BOOTSTRAP_GLIBC
-+typedef int _dl_load_lock;
-+typedef long int Lmid_t;
-+//typedef int Dl_serinfo;
-+#endif
-+
- __BEGIN_DECLS
- 
- /* We use this macro to refer to ELF types independent of the native wordsize.
-@@ -201,7 +207,7 @@ typedef void (*receiver_fct) (int, const
- 
- 
- #ifndef SHARED
--# define EXTERN extern
-+# define EXTERN //extern
- # define GL(name) _##name
- #else
- # define EXTERN
-diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.3.6/sysdeps/generic/libc-start.c 
glibc-2.3.6/sysdeps/generic/libc-start.c
---- /home/janneke/src/glibc-2.3.6/sysdeps/generic/libc-start.c 2005-02-16 
10:40:56.000000000 +0100
-+++ glibc-2.3.6/sysdeps/generic/libc-start.c   2018-08-29 19:53:16.068474727 
+0200
-@@ -16,6 +16,20 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#if BOOTSTRAP_GLIBC && !defined (NULL)
-+#define NULL 0
-+typedef unsigned long size_t;
-+typedef short int wchar_t;
-+void __libc_check_standard_fds (void);
-+
-+struct link_map;
-+struct r_scope_elem
-+{
-+  struct link_map **r_list;
-+  unsigned int r_nlist;
-+};
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
-@@ -162,7 +176,7 @@ LIBC_START_MAIN (int (*main) (int, char
-   if (fini)
-     __cxa_atexit ((void (*) (void *)) fini, NULL, NULL);
- 
--#ifndef SHARED
-+#if !defined (SHARED) && !BOOTSTRAP_GLIBC
-   /* Some security at this point.  Prevent starting a SUID binary where
-      the standard file descriptors are not opened.  We have to do this
-      only for statically linked applications since otherwise the dynamic
-diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.3.6/sysdeps/generic/libc-tls.c 
glibc-2.3.6/sysdeps/generic/libc-tls.c
---- /home/janneke/src/glibc-2.3.6/sysdeps/generic/libc-tls.c   2005-02-26 
02:09:44.000000000 +0100
-+++ glibc-2.3.6/sysdeps/generic/libc-tls.c     2018-08-29 19:53:36.628774155 
+0200
-@@ -17,6 +17,21 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#if BOOTSTRAP_GLIBC && !defined (NULL)
-+#define NULL 0
-+typedef unsigned long size_t;
-+typedef short int wchar_t;
-+
-+struct link_map;
-+struct r_scope_elem
-+{
-+  struct link_map **r_list;
-+  unsigned int r_nlist;
-+};
-+
-+#include "../../iconv/gconv.h"
-+#endif
-+
- #include <errno.h>
- #include <ldsodefs.h>
- #include <tls.h>
-diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.3.6/sysdeps/i386/fpu/ftestexcept.c 
glibc-2.3.6/sysdeps/i386/fpu/ftestexcept.c
---- /home/janneke/src/glibc-2.3.6/sysdeps/i386/fpu/ftestexcept.c       
2004-03-05 11:14:48.000000000 +0100
-+++ glibc-2.3.6/sysdeps/i386/fpu/ftestexcept.c 2018-07-03 14:46:38.418511151 
+0200
-@@ -26,7 +26,7 @@
- int
- fetestexcept (int excepts)
- {
--  int temp;
-+  short temp;
-   int xtemp = 0;
- 
-   /* Get current exceptions.  */
-diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.3.6/sysdeps/i386/i686/hp-timing.c 
glibc-2.3.6/sysdeps/i386/i686/hp-timing.c
---- /home/janneke/src/glibc-2.3.6/sysdeps/i386/i686/hp-timing.c        
2004-08-16 08:46:14.000000000 +0200
-+++ glibc-2.3.6/sysdeps/i386/i686/hp-timing.c  2018-08-29 19:53:40.560831424 
+0200
-@@ -18,6 +18,11 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#if BOOTSTRAP_GLIBC && !defined (NULL)
-+#define NULL 0
-+typedef unsigned long size_t;
-+#endif
-+
- #include <hp-timing.h>
- 
- /* We have to define the variable for the overhead.  */
-diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.3.6/sysdeps/unix/sysv/linux/init-first.c 
glibc-2.3.6/sysdeps/unix/sysv/linux/init-first.c
---- /home/janneke/src/glibc-2.3.6/sysdeps/unix/sysv/linux/init-first.c 
2004-03-05 11:14:48.000000000 +0100
-+++ glibc-2.3.6/sysdeps/unix/sysv/linux/init-first.c   2018-08-29 
19:53:59.437106337 +0200
-@@ -17,6 +17,21 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#if BOOTSTRAP_GLIBC && !defined (NULL)
-+#define NULL 0
-+typedef unsigned long size_t;
-+typedef short int wchar_t;
-+
-+struct link_map;
-+struct r_scope_elem
-+{
-+  struct link_map **r_list;
-+  unsigned int r_nlist;
-+};
-+
-+#include "../../../../iconv/gconv.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
diff --git a/gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch 
b/gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch
new file mode 100644
index 0000000..936d592
--- /dev/null
+++ b/gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch
@@ -0,0 +1,30 @@
+We want to allow builds in chroots that lack /bin/sh.  Thus, system(3)
+and popen(3) need to be tweaked to use the right shell.  For the bootstrap
+glibc, we just use whatever `sh' can be found in $PATH.  The final glibc
+instead uses the hard-coded absolute file name of `bash'.
+
+--- a/sysdeps/posix/system.c
++++ b/sysdeps/posix/system.c
+@@ -134,7 +134,7 @@ do_system (const char *line)
+       INIT_LOCK ();
+ 
+       /* Exec the shell.  */
+-      (void) __execve (SHELL_PATH, (char *const *) new_argv, __environ);
++      (void) __execvpe (SHELL_NAME, (char *const *) new_argv, __environ);
+       _exit (127);
+     }
+   else if (pid < (pid_t) 0)
+
+--- a/libio/iopopen.c
++++ b/libio/iopopen.c
+@@ -145,7 +145,7 @@ _IO_new_proc_open (fp, command, mode)
+           _IO_close (fd);
+       }
+ 
+-      _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0);
++      execlp ("sh", "sh", "-c", command, (char *) 0);
+       _IO__exit (127);
+     }
+   _IO_close (child_end);
+
+



reply via email to

[Prev in Thread] Current Thread [Next in Thread]