01/02: gnu: binutils: Update to 2.30.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit ff19532fd545fd1b039d471155c2430c8efc1b27
Author: Marius Bakke <address@hidden>
Date:   Fri Mar 16 14:53:01 2018 +0100

    gnu: binutils: Update to 2.30.
    
    * gnu/packages/patches/binutils-ld-new-dtags.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
    * gnu/packages/base.scm (binutils): Update to 2.30.
    [source](patches): Remove obsolete patch.
    [arguments]: Add "--enable-new-dtags" in #:configure-flags.
---
 gnu/local.mk                                     |  1 -
 gnu/packages/base.scm                            | 13 +++++++++----
 gnu/packages/patches/binutils-ld-new-dtags.patch | 16 ----------------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index c1df236..25a6b3b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -573,7 +573,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/bash-completion-directories.patch       \
   %D%/packages/patches/bazaar-CVE-2017-14176.patch             \
   %D%/packages/patches/bcftools-regidx-unsigned-char.patch     \
-  %D%/packages/patches/binutils-ld-new-dtags.patch             \
   %D%/packages/patches/binutils-loongson-workaround.patch      \
   %D%/packages/patches/blast+-fix-makefile.patch               \
   %D%/packages/patches/byobu-writable-status.patch             \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 892a416..783f2ca 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -415,16 +415,15 @@ change.  GNU make offers many powerful extensions over 
the standard utility.")
 (define-public binutils
   (package
    (name "binutils")
-   (version "2.28.1")
+   (version "2.30")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/binutils/binutils-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-              "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"))
-            (patches (search-patches "binutils-ld-new-dtags.patch"
-                                     "binutils-loongson-workaround.patch"))))
+              "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"))
+            (patches (search-patches "binutils-loongson-workaround.patch"))))
    (build-system gnu-build-system)
 
    ;; TODO: Add dependency on zlib + those for Gold.
@@ -433,6 +432,12 @@ change.  GNU make offers many powerful extensions over the 
standard utility.")
                           ;; on GCC when bootstrapping.
                           "LDFLAGS=-static-libgcc"
 
+                          ;; Turn on --enable-new-dtags by default to make the
+                          ;; linker set RUNPATH instead of RPATH on binaries.
+                          ;; This is important because RUNPATH can be overriden
+                          ;; using LD_LIBRARY_PATH at runtime.
+                          "--enable-new-dtags"
+
                           ;; Don't search under /usr/lib & co.
                           "--with-lib-path=/no-ld-lib-path"
 
diff --git a/gnu/packages/patches/binutils-ld-new-dtags.patch 
b/gnu/packages/patches/binutils-ld-new-dtags.patch
deleted file mode 100644
index 5f7a03f..0000000
--- a/gnu/packages/patches/binutils-ld-new-dtags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Turn on --enable-new-dtags by default to make the linker set RUNPATH
-instead of RPATH on binaries.  This is important because RUNPATH can
-be overriden using LD_LIBRARY_PATH at runtime.
-
-Patch from Nixpkgs by Eelco Dolstra <address@hidden>.
-
---- binutils/ld/ldmain.c
-+++ binutils/ld/ldmain.c
-@@ -296,6 +296,7 @@ main (int argc, char **argv)
-
-   link_info.allow_undefined_version = TRUE;
-   link_info.keep_memory = TRUE;
-+  link_info.new_dtags = TRUE;
-   link_info.combreloc = TRUE;
-   link_info.strip_discarded = TRUE;
-   link_info.callbacks = &link_callbacks;