From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 28 May 2013 21:12:11 +0000 (+0200)
Subject: Fix false positive in configure output if $CC contains options.
X-Git-Tag: 0.05~30
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=19d0b5330bbfc99c924edd98ab603d8032aa3c76;p=blhc%2Fblhc.git

Fix false positive in configure output if $CC contains options.

Debian bug #710135.
---

diff --git a/NEWS b/NEWS
index ce29d0c..4ac2e4c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 NEWS
 ====
 
+Version 0.XX
+------------
+
+- Fix false positive in configure output if $CC contains options (Debian bug
+  #710135).
+
+
 Version 0.04
 ------------
 
diff --git a/bin/blhc b/bin/blhc
index 783ae73..d5af8a0 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -852,7 +852,11 @@ foreach my $file (@ARGV) {
             next if $line =~ /^\s*(?:Host\s+)?(?:C(?:\+\+)?\s+)?
                                 [Cc]ompiler[\s.]*:?\s+
                                 /x;
-            next if $line =~ /^\s*(?:- )?(?:HOST_)?(?:CC|CXX)\s*=\s*$cc_regex_full\s*$/o;
+            next if $line =~ m{^\s*(?:-\s)?(?:HOST_)?(?:CC|CXX)
+                                \s*=\s*$cc_regex_full
+                                # optional compiler options, don't allow
+                                # "everything" here to prevent false negatives
+                                \s*(?:\s-\S+)*\s*$}xo;
             # `moc-qt4`/`moc-qt5` contain '-I.../linux-g++' in their command
             # line (or similar for other architectures) which gets recognized
             # as a compiler line, but `moc-qt*` is only a preprocessor for Qt
diff --git a/t/logs/configure b/t/logs/configure
index 5f45d19..ba8adbd 100644
--- a/t/logs/configure
+++ b/t/logs/configure
@@ -121,3 +121,20 @@ Configuration complete:
 LibCapability (enhanced
    privilege dropping): yes
          Linux Netlink: yes (mac80211 VAP creation) - libnl-3.0 libnl-genl-3.0
+
+# Debian #710135.
+  PREFIX          = /usr
+  EXEC-PREFIX     = /usr
+  VERSION         = 6.8.5
+  CC              = gcc -std=gnu99 -std=gnu99
+  CFLAGS          = -I/usr/include/lqr-1 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/freetype2 -fopenmp -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=16
+  CPPFLAGS        = -I/usr/include/ImageMagick-6
+  PCFLAGS         = -fopenmp -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=16
+  DEFS            = -DHAVE_CONFIG_H
+  LDFLAGS         = -Wl,-z,relro -Wl,--as-needed -L/usr/lib/X11
+  MAGICK_LDFLAGS  = -L/usr/lib/x86_64-linux-gnu -Wl,-z,relro -Wl,--as-needed -L/usr/lib/X11
+  LIBS            = -lMagickCore -llcms2 -lfreetype -llqr-1 -lglib-2.0 -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -llzma -lbz2 -lz -lltdl -lm -lgomp - lpthread
+  CXX             = g++
+  CXXFLAGS        = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -pthread
+  FEATURES        = DPC OpenMP Modules
+  DELEGATES       = bzlib djvu mpeg fftw fontconfig freetype jbig jng jp2 jpeg lcms lqr lzma openexr pango png ps tiff wmf x xml zlib