janneke pushed a commit to branch wip-bootstrap in repository guix. commit 780b4118b1e02947dbe51f991397c9a0a169eb63 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Sat Jun 9 23:31:41 2018 +0200
gnu: binutils-boot: Update to 2.14. * gnu/packages/mes.scm (binutils-boot): Update to 2.14. * gnu/packages/patches/binutils-boot-2.10.1.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/mes.scm | 22 +++++++--------------- gnu/packages/patches/binutils-boot-2.10.1.patch | 23 ----------------------- 3 files changed, 7 insertions(+), 39 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index c0153d0..a2e5385 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -594,7 +594,6 @@ dist_patch_DATA = \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/binutils-aarch64-symbol-relocation.patch \ - %D%/packages/patches/binutils-boot-2.10.1.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ %D%/packages/patches/boost-fix-icu-build.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 29f5daa..8f0cc51 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -545,15 +545,14 @@ standard.") (package (inherit binutils) (name "binutils-boot") - (version "2.10.1") + (version "2.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.gz")) - (patches (search-patches "binutils-boot-2.10.1.patch")) (sha256 (base32 - "1dgaabcap8d5r0j7fg7jvw9j2p0aqyw12k3mlp4d85rcdbhh1cwl")))) + "1w8xp7k44bkijr974x9918i4p1sw4g2fcd5mxvspkjpg38m214ds")))) (supported-systems '("i686-linux")) (native-inputs `(("flex" ,flex) ; MORTAL SIN HERE ("mes" ,mes-boot) @@ -567,7 +566,10 @@ standard.") (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (cppflags "-D __STDC__=1 -D __GLIBC_MINOR__=6")) + (cppflags (string-append + " -D __STDC__=1 " + " -D __GLIBC_MINOR__=6" + " -D MES_BOOTSTRAP=1"))) (unsetenv "C_INCLUDE_PATH") ; flex (unsetenv "LIBRARY_PATH") (setenv "CONFIG_SHELL" (string-append @@ -575,17 +577,7 @@ standard.") "/bin/sh")) (setenv "CPPFLAGS" cppflags) (setenv "AR" "tcc -ar") - (setenv "RANLIB" "true") - (setenv "CC" (string-append "tcc -static" " " cppflags)) - (setenv "CPP" (string-append "tcc -E" " " cppflags)) - (and - (zero? - (system* "./configure" - "--disable-shared" - "--enable-static" - "--host=i386-unknown-linux" - "--target=i386-unknown-linux" - (string-append "--prefix=" out)))))))))))) + (setenv "CXX" "false") (setenv "RANLIB" "true") (setenv "CC" (string-append "tcc -static" " " cppflags)) (setenv "CPP" (string-append "tcc -E" " " cppflags)) diff --git a/gnu/packages/patches/binutils-boot-2.10.1.patch b/gnu/packages/patches/binutils-boot-2.10.1.patch deleted file mode 100644 index 5fba3ac..0000000 --- a/gnu/packages/patches/binutils-boot-2.10.1.patch +++ /dev/null @@ -1,23 +0,0 @@ -Binary files ../binutils-2.10.1/if30640 and binutils-2.10.1/if30640 differ -diff -purN -x config.status -x config.h -x BOOT ../binutils-2.10.1/intl/localealias.c binutils-2.10.1/intl/localealias.c ---- ../binutils-2.10.1/intl/localealias.c 1999-05-03 09:29:05.000000000 +0200 -+++ binutils-2.10.1/intl/localealias.c 2018-06-06 06:52:48.434644103 +0200 -@@ -21,6 +21,7 @@ - #endif - - #include <ctype.h> -+#include <stdlib.h> - #include <stdio.h> - #include <sys/types.h> - -diff -purN -x config.status -x config.h -x BOOT ../binutils-2.10.1/ltmain.sh binutils-2.10.1/ltmain.sh ---- ../binutils-2.10.1/ltmain.sh 2000-02-27 17:46:19.000000000 +0100 -+++ binutils-2.10.1/ltmain.sh 2018-06-06 08:04:17.434957529 +0200 -@@ -874,6 +874,7 @@ compiler." - temp_rpath= - thread_safe=no - vinfo= -+ link_static_flag=-static - - # We need to know -static, to get the right output filenames. - for arg