From: Simon Ruderich <simon@ruderich.org>
Date: Thu, 22 Mar 2012 14:02:47 +0000 (+0100)
Subject: Remove unnecessary check for "Depends:".
X-Git-Tag: 0.01~73
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=b84ebbd86fd950d7334d2a2b4adf977918a56a47;p=blhc%2Fblhc.git

Remove unnecessary check for "Depends:".

The end of the build log is now respected, "Depends:" comes after that.
---

diff --git a/bin/blhc b/bin/blhc
index 9aa0133..47f4e2a 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -461,9 +461,6 @@ while (my $line = <>) {
                     or $line =~ /^\s*(?:- )?(?:HOST_)?(?:CC|CXX)\s*=\s*$cc_regex\s*$/
                     or $line =~ /^\s*-- Check for working (?:C|CXX) compiler: /
                     or $line =~ /^\s*(?:echo )?Using [A-Z_]+\s*=\s*/;
-            # Debian buildd output.
-            next if $line =~ /^\s*Depends: .*?$cc_regex.*?$/
-                    and $line !~ /\s-./; # option, prevent false negatives
 
             # Check if additional hardening options were used. Used to ensure
             # they are used for the complete build.
diff --git a/t/logs/debian b/t/logs/debian
index aede2a9..ce91a13 100644
--- a/t/logs/debian
+++ b/t/logs/debian
@@ -6,8 +6,6 @@ dh_auto_configure -- CFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4
 
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -c test.c
 
- Depends: libc6 (>= 2.7), gcc
-
 # `...` isn't expanded by the Makefile, assume dpkg-buildflags returns the
 # correct flags.
 gcc -c `dpkg-buildflags --get CFLAGS` test.c
@@ -17,3 +15,7 @@ gcc -c `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS` test.c
 g++ -c `dpkg-buildflags --get CXXFLAGS` `dpkg-buildflags --get CPPFLAGS` test.cc
 gcc -o test test.o `dpkg-buildflags --get LDFLAGS`
 gcc -o test test.o `dpkg-buildflags --get CFLAGS`
+
+Build finished at 20120308-1648
+
+ Depends: libc6 (>= 2.7), gcc