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

lcov: Apply upstream patch for GCC >= 4.7 compatibility

Browse Source
This commit is contained in:
Eelco Dolstra 2014-02-05 19:45:15 +01:00
parent c60f9cdb3e
commit d7cb2f5712
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/analysis/lcov/default.nix
View File

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
}; };
patches = patches =
(stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch); [ ./lcov-except-unreach.patch ]
++ stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch;
preBuild = '' preBuild = ''
makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man) makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man)

13
pkgs/development/tools/analysis/lcov/lcov-except-unreach.patch Normal file
View File

@ -0,0 +1,13 @@
http://ltp.cvs.sourceforge.net/viewvc/ltp/utils/analysis/lcov/bin/geninfo?r1=1.117&r2=1.118&view=patch
--- a/bin/geninfo 2012/10/10 08:36:16 1.117
+++ b/bin/geninfo 2012/11/13 09:58:53 1.118
@@ -1833,7 +1833,7 @@
push(@result, 0);
} else {
# Check for zero count
- if ($count eq "#####") {
+ if ($count =~ /^[#=]/) {
$count = 0;
}
push(@result, 1);