[SCM] qtbase packaging branch, experimental, updated. debian/5.10.0+dfsg-2-4-g5e45f2a

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 5e45f2ac181123bb62b78f933272940420b7685c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 16 20:08:11 2017 +0300

    Pass toolchain-related variable assignments as early flags to qmake.
    
    qmake calls $$QMAKE_CXX in toolchain.prf to get a list of library/
    include paths, so we need -early flag to make sure $$QMAKE_CXX is already
    properly set on that step.
    
    Switch to default model after passing them.
---
 debian/changelog | 2 ++
 debian/rules     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3963463..7cb482c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtbase-opensource-src (5.10.0+dfsg-3) UNRELEASED; urgency=medium
     Add two more places where config tests are currently false positives.
   * Make ${DEB_HOST_GNU_TYPE}-qmake script set QMAKE_QMAKE to itself.
     This is needed for properly building configuration tests.
+  * Pass toolchain-related variable assignments as early flags to qmake.
+    Switch to default model after passing them.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Dec 2017 19:16:38 +0300
 
diff --git a/debian/rules b/debian/rules
index 24ee610..f8dd58f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -264,11 +264,13 @@ endif
 	echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
 	echo "exec /usr/lib/qt5/bin/qmake" \
 		"-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \
+		"-early" \
 		'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \
 		'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
 		'QMAKE_LINK=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
 		"QMAKE_QMAKE=/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake" \
 		"PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config" \
+		"-before" \
 		'"$$@"' \
 		>> debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
 	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake

-- 
qtbase packaging