diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-01-09 19:24:32 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-01-09 19:24:32 +0000 |
commit | 2b464d6e13b57f290db95d4190903cf34d6f413a (patch) | |
tree | 688331c31e14bd7e9e8602a79aadcee8da194c61 /pkgs/development/tools/analysis | |
parent | 475ae50c7046dec8d7001a4e909e14a0e0121909 (diff) |
* lcov updated to 1.9.
svn path=/nixpkgs/trunk/; revision=25475
Diffstat (limited to 'pkgs/development/tools/analysis')
-rw-r--r-- | pkgs/development/tools/analysis/lcov/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/lcov/unexpected-eof.patch | 57 |
2 files changed, 3 insertions, 61 deletions
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 2e01a3a0784f4..73c3e66f074ea 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,16 +1,15 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "lcov-1.8"; + name = "lcov-1.9"; src = fetchurl { url = "mirror://sourceforge/ltp/${name}.tar.gz"; - sha256 = "1xrd9abh1gyki9ln9v772dq7jinvyrvx39s3kxbpiila68mbpa7j"; + sha256 = "1jhs1x2qy5la5gpdfl805zm11rsz6anla3b0wffk6wq79xfi4zn3"; }; patches = - [ ./unexpected-eof.patch - ./find-source.patch + [ ./find-source.patch ]; preBuild = '' diff --git a/pkgs/development/tools/analysis/lcov/unexpected-eof.patch b/pkgs/development/tools/analysis/lcov/unexpected-eof.patch deleted file mode 100644 index c263f621808c2..0000000000000 --- a/pkgs/development/tools/analysis/lcov/unexpected-eof.patch +++ /dev/null @@ -1,57 +0,0 @@ -From http://ltp.cvs.sourceforge.net/viewvc/ltp/utils/analysis/lcov/bin/geninfo?revision=1.72&view=markup - -Fixes "reached unexpected end of file" errors processing gcno files. - - ---- a/bin/geninfo 2010/01/29 11:07:25 1.71 -+++ b/bin/geninfo 2010/02/21 14:56:46 1.72 -@@ -2857,6 +2857,9 @@ - # Skip version and stamp - graph_skip(*HANDLE, 8, "version and stamp") or goto incomplete; - while (!eof(HANDLE)) { -+ my $next_pos; -+ my $curr_pos; -+ - # Read record tag - $tag = read_gcno_value(*HANDLE, $big_endian, "record tag"); - goto incomplete if (!defined($tag)); -@@ -2866,6 +2869,11 @@ - goto incomplete if (!defined($length)); - # Convert length to bytes - $length *= 4; -+ # Calculate start of next record -+ $next_pos = tell(HANDLE); -+ goto tell_error if ($next_pos == -1); -+ $next_pos += $length; -+ # Process record - if ($tag == $tag_function) { - ($filename, $function) = read_gcno_function_record( - *HANDLE, $bb, $fileorder, $base, $big_endian); -@@ -2882,6 +2890,14 @@ - graph_skip(*HANDLE, $length, "unhandled record") - or goto incomplete; - } -+ # Ensure that we are at the start of the next record -+ $curr_pos = tell(HANDLE); -+ goto tell_error if ($curr_pos == -1); -+ next if ($curr_pos == $next_pos); -+ goto record_error if ($curr_pos > $next_pos); -+ graph_skip(*HANDLE, $next_pos - $curr_pos, -+ "unhandled record content") -+ or goto incomplete; - } - close(HANDLE); - ($instr, $graph) = graph_from_bb($bb, $fileorder, $gcno_filename); -@@ -2898,6 +2914,12 @@ - magic_error: - graph_error($gcno_filename, "found unrecognized gcno file magic"); - return undef; -+tell_error: -+ graph_error($gcno_filename, "could not determine file position"); -+ return undef; -+record_error: -+ graph_error($gcno_filename, "found unrecognized record format"); -+ return undef; - } - - sub debug($) |