Ignore false positive from Meson build output

diff --git a/NEWS b/NEWS
index 2a586e87ce03dd63276ffc5b14e0372e8d4865b5..575310fe02a19fe1d94075f530210c6f62ca73bb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Version 0.XX
 
 - Add support to dynamically ignore lines from within the build log by
   embedding the string "blhc: ignore-line-regexp:" (Debian Bug #725484).
 
 - Add support to dynamically ignore lines from within the build log by
   embedding the string "blhc: ignore-line-regexp:" (Debian Bug #725484).

+- Fix false positive for meson build; reported by Yangfl (Debian Bug #953335).

 
 
 Version 0.11
 
 
 Version 0.11

diff --git a/bin/blhc b/bin/blhc
index 0d7276d90ba7f33a74f9257c9efd18836b4f6e20..44fa3cee9d74821e8a883c226d55e657ae8bfd1c 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -1076,6 +1076,8 @@ foreach my $file (@ARGV) {
             next if $line =~ m{$cc_regex_normal\s*>\s*\S+}o;
             # Hex output may contain "cc".
             next if $line =~ m#(?:\b[0-9a-fA-F]{2,}\b\s*){5}#;
             next if $line =~ m{$cc_regex_normal\s*>\s*\S+}o;
             # Hex output may contain "cc".
             next if $line =~ m#(?:\b[0-9a-fA-F]{2,}\b\s*){5}#;

+            # Meson build output
+            next if $line =~ /^C\+\+ linker for the host machine: /;

 
             # Check if additional hardening options were used. Used to ensure
             # they are used for the complete build.
 
             # Check if additional hardening options were used. Used to ensure
             # they are used for the complete build.

diff --git a/t/logs/false-positives b/t/logs/false-positives
index 8e7d6c37fb68a1a200f1ca99fc13b9878dbe4f64..3b7d18d6789de2a93b425c3dbb8b710718557924 100644 (file)
--- a/t/logs/false-positives
+++ b/t/logs/false-positives
@@ -66,3 +66,5 @@ Compiler executable checksum: 26648cf2c5cb5e5907eedabc7a0be2ce
 03d0 - 6e 57 7b cb f1 2d ec 4a-82 b6 b6 49 be 63 56 1a   nW{..-.J...I.cV.
 03e0 - 8c 1d af 9a e6 5c 5f 6e-03 f8 8e 9b 0b 30 b6 c0   .....\_n.....0..
 03f0 - 42 b6 a1 d9 b0 59 09 81-74 b1 1f c0 9c 3f c6 f1   B....Y..t....?..
 03d0 - 6e 57 7b cb f1 2d ec 4a-82 b6 b6 49 be 63 56 1a   nW{..-.J...I.cV.
 03e0 - 8c 1d af 9a e6 5c 5f 6e-03 f8 8e 9b 0b 30 b6 c0   .....\_n.....0..
 03f0 - 42 b6 a1 d9 b0 59 09 81-74 b1 1f c0 9c 3f c6 f1   B....Y..t....?..

+
+C++ linker for the host machine: c++ ld.bfd 2.34