From c4814aa2ad8a7a35e71839347b7fae2507be2ded Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 6 Oct 2019 20:43:10 +0200 Subject: [PATCH] Fix false positive in libtool detection with quoted path --- NEWS | 2 ++ bin/blhc | 2 +- t/logs/libtool | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index fcfcbeb..32459b1 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,8 @@ Version 0.XX bug #924387). - Fix false positive in non-verbose check for cython's .pyx files; reported by Picca Frédéric-Emmanuel (Debian Bug #939632). +- Fix false positive in libtool detection when the path to the libtool binary + is quoted; Yves-Alexis reported by Perez (Debian Bug #941836). Version 0.09 diff --git a/bin/blhc b/bin/blhc index fba278f..d6e2690 100755 --- a/bin/blhc +++ b/bin/blhc @@ -53,7 +53,7 @@ my $cc_regex_normal = qr/ my $warning_regex = qr/^(.+?):(\d+):\d+: warning: (.+?) \[(.+?)\]$/; # Regex to catch libtool commands and not lines which show commands executed # by libtool (e.g. libtool: link: ...). -my $libtool_regex = qr/\blibtool\s.*--mode=/; +my $libtool_regex = qr/\blibtool["']?\s.*--mode=/; my $libtool_link_regex = qr/\blibtool: link: /; # List of source file extensions which require preprocessing. diff --git a/t/logs/libtool b/t/logs/libtool index aec9602..4867b76 100644 --- a/t/logs/libtool +++ b/t/logs/libtool @@ -73,3 +73,5 @@ libtool: link: ( cd ".libs" && rm -f "libcoloredstderr.la" && ln -s "../libcolor /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wconversion -g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security -MT coloredstderr.lo -MD -MP -MF .deps/coloredstderr.Tpo -c -o coloredstderr.lo coloredstderr.c mv -f .deps/coloredstderr.Tpo .deps/coloredstderr.Plo /bin/bash ../libtool --silent --tag=CC --mode=link gcc -Wall -Wextra -Wconversion -g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security -fPIE -pie -Wl,-z,relro -Wl,-z,now -o libcoloredstderr.la -rpath /usr/local/lib coloredstderr.lo -ldl + +/bin/bash "/builds/debian/strongswan/debian/output/strongswan-5.8.0/libtool" --tag CC --mode=relink gcc -g -O2 -fdebug-prefix-map=/builds/debian/strongswan/debian/output/strongswan-5.8.0=. -fstack-protector-strong -Wformat -Werror=format-security -include /builds/debian/strongswan/debian/output/strongswan-5.8.0/config.h -no-undefined -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -Wl,-O1 -o libipsec.la -rpath /usr/lib/ipsec ipsec.lo esp_context.lo esp_packet.lo ip_packet.lo ipsec_event_relay.lo ipsec_policy.lo ipsec_policy_mgr.lo ipsec_processor.lo ipsec_sa.lo ipsec_sa_mgr.lo ../../src/libstrongswan/libstrongswan.la -inst-prefix-dir /builds/debian/strongswan/debian/output/strongswan-5.8.0/debian/tmp) -- 2.45.2