cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

binutils: 2.31.1 -> 2.33.1

Browse source 
- I've removed the stack of patch linked to
https://sourceware.org/bugzilla/show_bug.cgi?id=23428 . The associated
issue says it is closed and targeted for 2.32.

- I've ugraded the "no_plugin" patch. The logic changed in
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=41f37a6fb71f2a3de388108f5cdfca9cbe6e9d51
and I tried to keep the same logic by disabling everything.

It closes https://github.com/NixOS/nixpkgs/issues/78197
This commit is contained in:
Guillaume Bouchard 2020-01-21 20:09:13 +01:00 committed by Bernardo Meurer
parent b57016c8c8
commit f1bada765e
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/tools/misc/binutils/default.nix
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.31.1"; version = "2.33.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 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; sha256 = "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c";
}); });
in in
@ -68,12 +68,6 @@ 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" ];

26
pkgs/development/tools/misc/binutils/no-plugins.patch
View file

@ -1,19 +1,21 @@
diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c diff --git a/bfd/plugin.c b/bfd/plugin.c
--- binutils-2.27-orig/bfd/plugin.c 2016-10-14 17:46:30.791315555 +0200 index 537ab60311..bfe7957f96 100644
+++ binutils-2.27/bfd/plugin.c 2016-10-14 17:46:38.583298765 +0200 --- a/bfd/plugin.c
@@ -333,6 +333,7 @@ +++ b/bfd/plugin.c
@@ -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
plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL); /* Try not to search the same dir twice, by looking at st_dev and
p = make_relative_prefix (plugin_program_name, st_ino for the dir. If we are on a file system that always sets
BINDIR, st_ino to zero or the actual st_ino is zero we might waste some
@@ -364,6 +365,7 @@ @@ -437,7 +438,7 @@ load_plugin (bfd *abfd)
free (p); if (found)
if (d) break;
closedir (d); }
-
+#endif +#endif
return found; return found;
} }