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

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 79a78616a479231381386d9a0dda45e466d28642
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 8 11:48:26 2017 +0300

    Pass the compiler and linker flags to configure explicitly.
    
    They will be no longer read from the environment, see
    https://code.qt.io/cgit/qt/qtbase.git/commit/?id=fd3e12e7a6c71a24.
---
 debian/changelog | 2 ++
 debian/rules     | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 326bb8a..ee46285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ qtbase-opensource-src (5.8.0+dfsg-1) UNRELEASED; urgency=medium
     - qsettings_simplify_logic.diff
     - qsettings_XDG_CONFIG_DIRS.diff
   * Drop “-gstreamer 1.0” configuration option, dropped upstream.
+  * Pass the compiler and linker flags to configure explicitly,
+    they will be no longer read from the environment.
 
   [ Alexander Volkov ]
   * Remove debian/90qt5-opengl script, no longer needed (refs: #850705).
diff --git a/debian/rules b/debian/rules
index 4baa2fa..2eb1a5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,7 +141,10 @@ override_dh_auto_configure:
 	            -compile-examples \
 	            -no-directfb \
 	            $(extra_configure_opts) \
-	            $(cpu_opt)
+	            $(cpu_opt) \
+	            QMAKE_CFLAGS="$(CFLAGS)" \
+	            QMAKE_CXXFLAGS="$(CXXFLAGS)" \
+	            QMAKE_LFLAGS="$(LDFLAGS)"
 
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) confclean distclean

-- 
qtbase packaging