[SCM] qtbase packaging branch, experimental, updated. debian/5.7.1+dfsg-3-7-ga02698b

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=a02698b

The following commit has been merged in the experimental branch:
commit a02698bbadfd2021486e621e1ba70938b5443fd3
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 8 17:05:39 2017 +0300

    Inject our flags also to build of qmake and tools using host_build.
---
 debian/rules | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 2eb1a5a..a31221f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,7 +97,8 @@ endif
 	dh $@ --parallel --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	MAKEFLAGS="-j$(NUMJOBS)" ./configure \
+	MAKEFLAGS="-j$(NUMJOBS) ${CXXFLAGS:%=EXTRA_CXXFLAGS+=%} ${LDFLAGS:%=EXTRA_LFLAGS+=%}" \
+	        ./configure \
 	            -confirm-license \
 	            -prefix "/usr" \
 	            -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
@@ -145,6 +146,9 @@ override_dh_auto_configure:
 	            QMAKE_CFLAGS="$(CFLAGS)" \
 	            QMAKE_CXXFLAGS="$(CXXFLAGS)" \
 	            QMAKE_LFLAGS="$(LDFLAGS)"
+	# qtConfOutput_qmakeArgs sets the flags inside a !host_build {...}
+	# block, but we want them to be set for tools using host_build too.
+	sed -i "s/\!host_build {/true {/" mkspecs/qmodule.pri
 
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) confclean distclean

-- 
qtbase packaging