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

Merge pull request #39624 from Ekleog/kcov-35

Browse Source 
kcov: 34 -> 35
This commit is contained in:
Jörg Thalheim 2018-04-27 23:25:27 +01:00 committed by GitHub
commit 68d144b6ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch Normal file
View File

@ -0,0 +1,12 @@
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>

8
pkgs/development/tools/analysis/kcov/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kcov-${version}"; name = "kcov-${version}";
version = "34"; version = "35";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SimonKagstrom"; owner = "SimonKagstrom";
repo = "kcov"; repo = "kcov";
rev = "v${version}"; rev = "v${version}";
sha256 = "1i4pn5na8m308pssk8585nmqi8kwd63a9h2rkjrn4w78ibmxvj01"; sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw";
}; };
preConfigure = "patchShebangs src/bin-to-c-source.py"; preConfigure = "patchShebangs src/bin-to-c-source.py";
@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
patches = [ ./aarch64_nt_prstatus.patch ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
homepage = http://simonkagstrom.github.io/kcov/index.html; homepage = http://simonkagstrom.github.io/kcov/index.html;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.gal_bolle ]; maintainers = with maintainers; [ gal_bolle ekleog ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }