X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=fa0f8a396baa04fcfccbe4e9208f6a392898bf84;hp=4d2fb099cc70f72425791982b1c4ce1e528ccdac;hb=d52160954caa2af70f44181bcf113df1a5c3c61b;hpb=a0f80b21eb2a1cc3bb306a68fb7a3beed1df9072

diff --git a/bin/blhc b/bin/blhc
index 4d2fb09..fa0f8a3 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -445,7 +445,7 @@ sub pic_pie_conflict {
 }
 
 sub is_non_verbose_build {
-    my ($line, $next_line, $skip_ref) = @_;
+    my ($line, $skip_ref, $input_ref, $line_offset, $line_count) = @_;
 
     if ($line =~ /$libtool_regex/o) {
         # libtool's --silent hides the real compiler flags.
@@ -485,25 +485,30 @@ sub is_non_verbose_build {
     my $file = $1;
 
     # On the first pass we only check if this line is verbose or not.
-    return 1 if not defined $next_line;
+    return 1 if not defined $input_ref;
 
-    # Second pass, we have access to the next line.
+    # Second pass, we have access to the next lines.
     ${$skip_ref} = 0;
 
     # CMake and other build systems print the non-verbose messages also when
     # building verbose. If a compiler and the file name occurs in the next
-    # line, treat it as verbose build.
+    # lines, treat it as verbose build.
     if (defined $file) {
         # Get filename, we can't use the complete path as only parts of it are
         # used in the real compiler command.
         $file =~ m{/([^/\s]+)$};
         $file = $1;
 
-        if (index($next_line, $file) != -1 and $next_line =~ /$cc_regex/o) {
-            # Not a non-verbose line, but we still have to skip the current line
-            # as it doesn't contain any compiler commands.
-            ${$skip_ref} = 1;
-            return 0;
+        for (my $i = 1; $i <= $line_count; $i++) {
+            my $next_line = $input_ref->[$line_offset + $i];
+            last unless defined $next_line;
+
+            if (index($next_line, $file) != -1 and $next_line =~ /$cc_regex/o) {
+                # Not a non-verbose line, but we still have to skip the
+                # current line as it doesn't contain any compiler commands.
+                ${$skip_ref} = 1;
+                return 0;
+            }
         }
     }
 
@@ -718,6 +723,11 @@ foreach my $file (@ARGV) {
     # for performance reasons.
     my $ada = 0;
 
+    # Number of parallel jobs to prevent false positives when detecting
+    # non-verbose builds. As not all jobs declare the number of parallel jobs
+    # use a large enough default.
+    my $parallel = 10;
+
     while (my $line = <$fh>) {
         # Detect architecture automatically unless overridden. For buildd logs
         # only, doesn't use the dpkg-buildpackage header. Necessary to ignore
@@ -811,6 +821,11 @@ foreach my $file (@ARGV) {
             }
         }
 
+        # This flags is not always available, but if it is use it.
+        if ($line =~ /^DEB_BUILD_OPTIONS=.*\bparallel=(\d+)/) {
+            $parallel = $1;
+        }
+
         # We skip over unimportant lines at the beginning of the log to
         # prevent false positives.
         last if index($line, 'dpkg-buildpackage: ') == 0;
@@ -868,7 +883,7 @@ foreach my $file (@ARGV) {
 
         # Check if this line indicates a non verbose build.
         my $skip = 0;
-        $non_verbose |= is_non_verbose_build($line, undef, \$skip);
+        $non_verbose |= is_non_verbose_build($line, \$skip);
         next if $skip;
 
         # One line may contain multiple commands (";"). Treat each one as
@@ -1103,7 +1118,8 @@ LINE:
 
         my $skip = 0;
         if ($input_nonverbose[$i]
-                and is_non_verbose_build($line, $input[$i + 1], \$skip)) {
+                and is_non_verbose_build($line, \$skip,
+                                         \@input, $i, $parallel)) {
             if (not $option_buildd) {
                 error_non_verbose_build($line);
                 $exit |= $exit_code{non_verbose_build};