Merge pull request #45755 from Ekleog/kcov-36

kcov: 35 -> 36
This commit is contained in:
Jörg Thalheim 2018-08-29 17:27:26 +01:00 committed by GitHub
commit d6305a5bec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 16 deletions

View file

@ -1,12 +0,0 @@
diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc
index 59b615f..e02cddf 100644
--- a/src/engines/ptrace.cc
+++ b/src/engines/ptrace.cc
@@ -21,6 +21,7 @@
#if defined(__aarch64__)
# include <sys/uio.h>
+# include <elf.h>
#endif
#include <map>

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "kcov-${version}";
version = "35";
version = "36";
src = fetchFromGitHub {
owner = "SimonKagstrom";
repo = "kcov";
rev = "v${version}";
sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw";
sha256 = "1q1mw5mxz041lr6qc2v4280rmx13pg1bx5r3bxz9bzs941r405r3";
};
preConfigure = "patchShebangs src/bin-to-c-source.py";
@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
patches = [ ./aarch64_nt_prstatus.patch ];
enableParallelBuilding = true;
meta = with stdenv.lib; {