janneke pushed a commit to branch wip-bootstrap in repository guix. commit f178a4045bf04ef138d413f39892704129c7f084 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Sat Jun 23 14:40:25 2018 +0200
gnu: Remove binutils-boot0-cheat. * gnu/packages/mes.scm (binutils-boot0-cheat): Remove. --- gnu/packages/mes.scm | 85 ++-------------------------------------------------- 1 file changed, 2 insertions(+), 83 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 50b29d1..a7345a6 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -637,8 +637,8 @@ standard.") (package (inherit binutils) (name "binutils-boot0") - (version "2.20.1a") - (source (origin + (version "2.20.1a") + (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) @@ -715,87 +715,6 @@ standard.") (copy-file (string-append binutils "/bin/ar") "binutils/ar") (copy-file (string-append binutils "/bin/ld") "ld/ld-new"))))))))) -(define-public binutils-boot0-cheat - (let* ((triplet "i686-unknown-linux-gnu") - (tool-prefix (string-append triplet "-"))) - (package - (inherit binutils-boot0-real) - (name "binutils-boot0-cheat") - (supported-systems '("i686-linux")) - (native-inputs `(("flex" ,flex) ; cheat - ("binutils" ,(cross-binutils triplet)) - ("gcc" ,(cross-gcc triplet)) - ("glibc" ,(cross-libc triplet)) - ("kernel-headers" ,(linux-libre-headers-boot0)))) - (arguments - `(#:tests? #f ; runtest: command not found - #:parallel-build? #f - #:strip-binaries? #f - #:make-flags (list "RANLIB=true") - #: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")) - (headers (assoc-ref %build-inputs "kernel-headers")) - (cppflags (string-append " --static -static" - " -D MES_BOOTSTRAP=1" - " -B " glibc "/lib" - " -I " glibc "/include" - " -I " headers "/include")) - (ldflags (string-append " --static -static" - " -B " glibc "/lib"))) - (setenv "C_INCLUDE_PATH" - (string-append glibc "/include" - ":" headers "/include")) - (setenv "LIBRARY_PATH" - (string-append glibc "/lib")) - (setenv "PATH" - (string-append - (assoc-ref %build-inputs "flex") "/bin" - ":" (assoc-ref %build-inputs "gcc") "/bin" - ":" (assoc-ref %build-inputs "binutils") "/" ,triplet "/bin" - - ;; more bootstrap cheats - ":" (assoc-ref %build-inputs "bash") "/bin" - ":" (assoc-ref %build-inputs "bzip2") "/bin" - ":" (assoc-ref %build-inputs "coreutils") "/bin" - ":" (assoc-ref %build-inputs "diffutils") "/bin" - ;;":" (assoc-ref %build-inputs "file") "/bin" - ;;":" (assoc-ref %build-inputs "findutils") "/bin" - ":" (assoc-ref %build-inputs "gawk") "/bin" - - ":" (assoc-ref %build-inputs "grep") "/bin" - ":" (assoc-ref %build-inputs "gzip") "/bin" - ;;":" (assoc-ref %build-inputs "m4") "/bin" - ":" (assoc-ref %build-inputs "make") "/bin" - ;;":" (assoc-ref %build-inputs "patch") "/bin" - ":" (assoc-ref %build-inputs "sed") "/bin" - ":" (assoc-ref %build-inputs "tar") "/bin")) - - (setenv "CONFIG_SHELL" (string-append - (assoc-ref %build-inputs "bash") - "/bin/sh")) - (setenv "CPPFLAGS" cppflags) - (setenv "AR" "ar") - (setenv "RANLIB" "true") - (setenv "CC" (string-append ,tool-prefix "gcc" cppflags ldflags)) - (setenv "LD" (string-append ,tool-prefix "gcc" ldflags)) - (setenv "CPP" (string-append ,tool-prefix "gcc -E" " " cppflags)) - (setenv "CC_FOR_BUILD" (string-append ,tool-prefix "gcc" cppflags ldflags)) - - (format (current-error-port) "PATH=~a\n" (getenv "PATH")) - (format (current-error-port) "CC=~a\n" (getenv "CC")) - - (and (zero? (system* "./configure" - "--disable-nls" - "--disable-shared" - "--disable-werror" - "--host=i386-unknown-linux" - "--target=i386-unknown-linux" - (string-append "--prefix=" out))))))))))))) - (define-public binutils-boot (package (inherit binutils-boot0)