public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "binutils: 2.31.1 -> 2.33.1"

Browse Source 
This reverts commit efdb29597a.
This commit is contained in:
Florian Klink
2020-04-29 15:48:26 +02:00
parent e30f1e3c80
commit 607c4d8bb8
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/binutils/default.nix
+8 -2
View File
@@ -16,7 +16,7 @@ let
# Remove gold-symbol-visibility patch when updating, the proper fix # Remove gold-symbol-visibility patch when updating, the proper fix
# is now upstream. # is now upstream.
# https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
version = "2.33.1"; version = "2.31.1";
basename = "binutils"; basename = "binutils";
# The targetPrefix prepended to binary names to allow multiple binuntils on the # The targetPrefix prepended to binary names to allow multiple binuntils on the
# PATH to both be usable. # PATH to both be usable.
@@ -31,7 +31,7 @@ let
# HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
sha256 = "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"; sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
}); });
in in
@@ -68,6 +68,12 @@ stdenv.mkDerivation {
[ [
# https://sourceware.org/bugzilla/show_bug.cgi?id=22868 # https://sourceware.org/bugzilla/show_bug.cgi?id=22868
./gold-symbol-visibility.patch ./gold-symbol-visibility.patch
# https://sourceware.org/bugzilla/show_bug.cgi?id=23428
# un-break features so linking against musl doesn't produce crash-only binaries
./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch;
outputs = [ "out" "info" "man" ]; outputs = [ "out" "info" "man" ];
pkgs/development/tools/misc/binutils/no-plugins.patch
+12 -14
View File
@@ -1,21 +1,19 @@
diff --git a/bfd/plugin.c b/bfd/plugin.c diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c
index 537ab60311..bfe7957f96 100644 --- binutils-2.27-orig/bfd/plugin.c 2016-10-14 17:46:30.791315555 +0200
--- a/bfd/plugin.c +++ binutils-2.27/bfd/plugin.c 2016-10-14 17:46:38.583298765 +0200
+++ b/bfd/plugin.c @@ -333,6 +333,7 @@
@@ -386,6 +386,7 @@ load_plugin (bfd *abfd)
if (plugin_program_name == NULL) if (plugin_program_name == NULL)
return found; return found;
+#if 0 +#if 0
/* Try not to search the same dir twice, by looking at st_dev and plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL);
st_ino for the dir. If we are on a file system that always sets p = make_relative_prefix (plugin_program_name,
st_ino to zero or the actual st_ino is zero we might waste some BINDIR,
@@ -437,7 +438,7 @@ load_plugin (bfd *abfd) @@ -364,6 +365,7 @@
if (found) free (p);
break; if (d)
} closedir (d);
-
+#endif +#endif
return found; return found;
} }