janneke pushed a commit to branch wip-bootstrap in repository guix. commit d67ce17669906d65e7161c3b0b6c47d735ae3e30 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Fri Jun 29 21:18:05 2018 +0200
gnu: glibc-mesboot: Package with bootstrap-guile. * gnu/packages/mes.scm (glibc-mesboot): Package with bootstrap-guile. --- gnu/packages/mes.scm | 157 ++++++++++++++++++++++++++------------------------- 1 file changed, 79 insertions(+), 78 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index ed5e548..0860ec5 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -835,87 +835,88 @@ ac_cv_c_float_format='IEEE (little-endian)' (string-append out "/include")))))))))))) (define-public glibc-mesboot - (package - (inherit glibc) - (name "glibc-mesboot") - (version "2.2.5") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/glibc/glibc-" - version - ".tar.gz")) - (patches (search-patches "glibc-boot-2.2.5.patch")) - (sha256 - (base32 - "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q")))) - (supported-systems '("i686-linux")) - (native-inputs `(("binutils" ,binutils-mesboot0) - ("gcc" ,gcc-core-mesboot) - ("kernel-headers" ,(linux-libre-headers-boot0)))) - (outputs '("out")) - (arguments - `(#:tests? #f - #:strip-binaries? #f - #:parallel-build? #f ; gcc-2.95.3 ICEs on massively parallel builds - #:configure-flags - (let ((out (assoc-ref %outputs "out")) - (headers (assoc-ref %build-inputs "kernel-headers"))) - #:configure-flags - (list - "--disable-shared" - "--enable-static" - "--disable-sanity-checks" - "--host=i386-unknown-linux" - "--target=i386-unknown-linux" - (string-append "--with-headers=" headers "/include") - "--enable-static-nss" - "--without-__thread" - "--without-cvs" - "--without-gd" - "--without-tls" - (string-append "--prefix=" out))) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (headers (assoc-ref %build-inputs "kernel-headers")) - (gcc (assoc-ref %build-inputs "gcc")) - (cppflags (string-append - " -D __STDC__=1" - " -D MES_BOOTSTRAP=1" - " -D BOOTSTRAP_GLIBC=1")) - (cflags (string-append " -L " (getcwd)))) - (setenv "CONFIG_SHELL" (string-append - (assoc-ref %build-inputs "bash") - "/bin/sh")) + (package-with-bootstrap-guile + (package + (inherit glibc) + (name "glibc-mesboot") + (version "2.2.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" + version + ".tar.gz")) + (patches (search-patches "glibc-boot-2.2.5.patch")) + (sha256 + (base32 + "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q")))) + (supported-systems '("i686-linux")) + (native-inputs `(("binutils" ,binutils-mesboot0) + ("gcc" ,gcc-core-mesboot) + ("kernel-headers" ,(linux-libre-headers-boot0)))) + (outputs '("out")) + (arguments + `(#:tests? #f + #:strip-binaries? #f + #:parallel-build? #f ; gcc-2.95.3 ICEs on massively parallel builds + #:configure-flags + (let ((out (assoc-ref %outputs "out")) + (headers (assoc-ref %build-inputs "kernel-headers"))) + #:configure-flags + (list + "--disable-shared" + "--enable-static" + "--disable-sanity-checks" + "--host=i386-unknown-linux" + "--target=i386-unknown-linux" + (string-append "--with-headers=" headers "/include") + "--enable-static-nss" + "--without-__thread" + "--without-cvs" + "--without-gd" + "--without-tls" + (string-append "--prefix=" out))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (headers (assoc-ref %build-inputs "kernel-headers")) + (gcc (assoc-ref %build-inputs "gcc")) + (cppflags (string-append + " -D __STDC__=1" + " -D MES_BOOTSTRAP=1" + " -D BOOTSTRAP_GLIBC=1")) + (cflags (string-append " -L " (getcwd)))) + (setenv "CONFIG_SHELL" (string-append + (assoc-ref %build-inputs "bash") + "/bin/sh")) - (setenv "PATH" - (string-append - (assoc-ref %build-inputs "binutils") "/bin" - ":" (assoc-ref %build-inputs "gcc") "/bin" + (setenv "PATH" + (string-append + (assoc-ref %build-inputs "binutils") "/bin" + ":" (assoc-ref %build-inputs "gcc") "/bin" - ;; more bootstrap cheats - ":" (assoc-ref %build-inputs "bash") "/bin" - ":" (assoc-ref %build-inputs "coreutils") "/bin" - ":" (assoc-ref %build-inputs "diffutils") "/bin" - ":" (assoc-ref %build-inputs "gawk") "/bin" - ":" (assoc-ref %build-inputs "grep") "/bin" - ":" (assoc-ref %build-inputs "gzip") "/bin" - ":" (assoc-ref %build-inputs "make") "/bin" - ":" (assoc-ref %build-inputs "sed") "/bin" - ":" (assoc-ref %build-inputs "tar") "/bin")) + ;; more bootstrap cheats + ":" (assoc-ref %build-inputs "bash") "/bin" + ":" (assoc-ref %build-inputs "coreutils") "/bin" + ":" (assoc-ref %build-inputs "diffutils") "/bin" + ":" (assoc-ref %build-inputs "gawk") "/bin" + ":" (assoc-ref %build-inputs "grep") "/bin" + ":" (assoc-ref %build-inputs "gzip") "/bin" + ":" (assoc-ref %build-inputs "make") "/bin" + ":" (assoc-ref %build-inputs "sed") "/bin" + ":" (assoc-ref %build-inputs "tar") "/bin")) - (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) - (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) - (unsetenv "C_INCLUDE_PATH") - (unsetenv "LIBRARY_PATH")))) - ;; glibc-2.2.5 needs a slightly more classical invocation of configure - ;; configure: warning: CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash: invalid host type - (replace 'configure - (lambda* (#:key configure-flags #:allow-other-keys) - (zero? - (apply system* "./configure" configure-flags))))))))) + (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) + (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) + (unsetenv "C_INCLUDE_PATH") + (unsetenv "LIBRARY_PATH")))) + ;; glibc-2.2.5 needs a slightly more classical invocation of configure + ;; configure: warning: CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash: invalid host type + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (zero? + (apply system* "./configure" configure-flags)))))))))) (define-public gcc-mesboot0 (package