janneke pushed a commit to branch wip-bootstrap in repository guix. commit e4f7217ea271be98331eb48e265b54899177e4fa Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Sun Jun 17 20:52:37 2018 +0200
gnu: Add binutils-boot 2.20.1, built with gcc+glibc. * gnu/packages/mes.scm (binutils-boot0): Rename from binutils-boot. (binutils-boot): New package. --- gnu/packages/mes.scm | 49 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index cf7edc7..c003989 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -542,10 +542,10 @@ standard.") (system* "./configure" (string-append "--prefix=" out))))))))))) -(define-public binutils-boot +(define-public binutils-boot0 (package (inherit binutils) - (name "binutils-boot") + (name "binutils-boot0") (version "2.14") (source (origin (method url-fetch) @@ -555,7 +555,7 @@ standard.") (base32 "1w8xp7k44bkijr974x9918i4p1sw4g2fcd5mxvspkjpg38m214ds")))) (supported-systems '("i686-linux")) - (native-inputs `(("flex" ,flex) ; MORTAL SIN HERE + (native-inputs `(("flex" ,flex) ; MORTAL SIN HERE ("mes" ,mes-boot) ("tcc" ,tcc-boot))) (arguments @@ -585,11 +585,42 @@ standard.") (and (zero? (system* "./configure" - "--disable-shared" - "--enable-static" - "--host=i386-unknown-linux" - "--target=i386-unknown-linux" - (string-append "--prefix=" out)))))))))))) + "--disable-shared" + "--enable-static" + "--host=i386-unknown-linux" + "--target=i386-unknown-linux" + (string-append "--prefix=" out)))))))))))) + +(define-public binutils-boot + (package + (inherit binutils-boot0) + (name "binutils-boot") + (native-inputs `(("flex" ,flex) ; cheat + ("glibc" ,glibc-boot) + ("gcc" ,gcc-boot))) + (arguments + `(#:tests? #f ; runtest: command not found + #:parallel-build? #f + #:strip-binaries? #f + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (glibc (assoc-ref %build-inputs "glibc"))) + (setenv "C_INCLUDE_PATH" (string-append glibc "/include")) + (unsetenv "LIBRARY_PATH" (string-append glibc "/lib")) + (setenv "CONFIG_SHELL" (string-append + (assoc-ref %build-inputs "bash") + "/bin/sh")) + (and (zero? + (system* "./configure" + "--disable-nls" + "--disable-shared" + "--disable-werror" + "--host=i386-unknown-linux" + "--target=i386-unknown-linux" + (string-append "--prefix=" out)))))))))))) (define-public gcc-core-boot (package @@ -606,7 +637,7 @@ standard.") (base32 "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an")))) (supported-systems '("i686-linux")) - (native-inputs `(("binutils" ,binutils-boot) + (native-inputs `(("binutils" ,binutils-boot0) ("tcc" ,tcc-boot))) (outputs '("out")) (arguments