From: Simon Ruderich Date: Sun, 18 Mar 2012 15:07:00 +0000 (+0100) Subject: Ignore buildd's Depends: output. X-Git-Tag: 0.01~90 X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=commitdiff_plain;h=65129c8b72aecd6f2f44cde405bf81c803fa3ba9 Ignore buildd's Depends: output. --- diff --git a/bin/blhc b/bin/blhc index a29313d..bd9ebbd 100755 --- a/bin/blhc +++ b/bin/blhc @@ -345,6 +345,10 @@ while (my $line = <>) { or $line =~ /^\s*(?:- )?(?: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 + push @input, $line; } diff --git a/t/logs/debian b/t/logs/debian index 9665e8f..5161689 100644 --- a/t/logs/debian +++ b/t/logs/debian @@ -5,3 +5,5 @@ dpkg-buildpackage: source package test dh_auto_configure -- CFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security" CPPFLAGS="-D_FORTIFY_SOURCE=2" CXXFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security" LDFLAGS="-Wl,-z,relro -Wl,-z,defs -Wl,--as-needed" ... 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