Add back missing patches

This commit is contained in:
Christoph Reiter
2022-07-28 20:40:29 +02:00
parent eed1eb3502
commit 1e483c4e79
2 changed files with 60 additions and 0 deletions

View File

@@ -0,0 +1,23 @@
Description: Handle "=====" as another form of zero.
gcov prints "=====" instead of "######" when an unexecuted line is
"reachable only by exceptional paths such as C++ exception handlers."
This should be handled the same as "######" for our purposes.
Author: Zack Weinberg <zackw@panix.com>
Last-Update: 2013-02-01
Index: lcov-1.12/bin/geninfo
===================================================================
--- lcov-1.12.orig/bin/geninfo
+++ lcov-1.12/bin/geninfo
@@ -1771,8 +1771,9 @@ sub read_gcov_file($)
$number = (split(" ",substr($_, 0, 16)))[0];
# Check for zero count which is indicated
- # by ######
- if ($number eq "######") { $number = 0; }
+ # by ###### or =====
+ if ($number eq "######" or
+ $number eq "=====") { $number = 0; }
if ($exclude_line) {
# Register uninstrumented line instead

View File

@@ -0,0 +1,37 @@
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Fix for undefined behavior in perl5.20
Origin: http://bugs.debian.org/761308
Forwarded: no
Last-Updated: 2014-09-13
Index: lcov-1.12/bin/lcov
===================================================================
--- lcov-1.12.orig/bin/lcov
+++ lcov-1.12/bin/lcov
@@ -224,7 +224,9 @@ Getopt::Long::Configure("default");
# Remove spaces around rc options
my %new_opt_rc;
- while (my ($key, $value) = each(%opt_rc)) {
+ my @keys = keys %opt_rc;
+ for my $key (@keys) {
+ my $value = $opt_rc{$key};
$key =~ s/^\s+|\s+$//g;
$value =~ s/^\s+|\s+$//g;
Index: lcov-1.12/bin/geninfo
===================================================================
--- lcov-1.12.orig/bin/geninfo
+++ lcov-1.12/bin/geninfo
@@ -284,8 +284,9 @@ Getopt::Long::Configure("default");
{
# Remove spaces around rc options
my %new_opt_rc;
-
- while (my ($key, $value) = each(%opt_rc)) {
+ my @keys = keys %opt_rc;
+ for my $key (@keys) {
+ my $value = $opt_rc{$key};
$key =~ s/^\s+|\s+$//g;
$value =~ s/^\s+|\s+$//g;