Merge branch 'master' into gcc-6
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.28";
|
||||
version = "2.29";
|
||||
basename = "binutils-${version}";
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
# The prefix prepended to binary names to allow multiple binuntils on the
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/binutils/${basename}.tar.bz2";
|
||||
sha256 = "0wiasgns7i8km8nrxas265sh2dfpsw93b3qw195ipc90w4z475v2";
|
||||
sha256 = "1gqfyksdnj3iir5gzyvlp785mnk60g1pll6zbzbslfchhr4rb8i9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -45,6 +45,15 @@ stdenv.mkDerivation rec {
|
||||
# there) and causes a cycle between the lib and bin outputs, so
|
||||
# get rid of it.
|
||||
./no-plugins.patch
|
||||
|
||||
# remove after 2.29.1/2.30
|
||||
(fetchurl {
|
||||
url = "https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=c6b78c965a96fb152fbd58926edccb5dee2707a5";
|
||||
sha256 = "0rkbq5pf7ffgcggfk4czkxin1091bqjj92an9wxnqkgqwq6cx5yr";
|
||||
name = "readelf-empty-sections.patch";
|
||||
})
|
||||
./elf-check-orphan-input.patch
|
||||
./elf-check-orphan-placement.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" ]
|
||||
|
||||
Reference in New Issue
Block a user