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

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 19a97917bad72010b58366a6943b02be647aaffc
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jan 9 16:19:30 2018 +0300

    Support <triplet>-qmake -query something.
    
    Thanks to Helmut Grohne.
    Closes: #886542.
---
 debian/changelog              |  2 ++
 debian/qmake-cross-wrapper.in | 16 ++++++++++++++++
 debian/rules                  | 15 +++------------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee5c6a9..b8f9985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtbase-opensource-src (5.10.0+dfsg-3) UNRELEASED; urgency=medium
     This is needed for properly building configuration tests.
   * Pass toolchain-related variable assignments as early flags to qmake.
     Switch to default mode after passing them.
+  * Support <triplet>-qmake -query something (closes: #886542). Thanks to
+    Helmut Grohne.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Dec 2017 19:16:38 +0300
 
diff --git a/debian/qmake-cross-wrapper.in b/debian/qmake-cross-wrapper.in
new file mode 100644
index 0000000..91cf85e
--- /dev/null
+++ b/debian/qmake-cross-wrapper.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ "x$1" = x-query ]; then
+	exec /usr/lib/qt5/bin/qmake "$@" -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt5/qt.conf
+fi
+
+exec /usr/lib/qt5/bin/qmake \
+	-qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt5/qt.conf \
+	-early \
+	QMAKE_CC=${CC:- at DEB_HOST_GNU_TYPE@-gcc} \
+	QMAKE_CXX=${CXX:- at DEB_HOST_GNU_TYPE@-g++} \
+	QMAKE_LINK=${CXX:- at DEB_HOST_GNU_TYPE@-g++} \
+	QMAKE_QMAKE=/usr/bin/@DEB_HOST_GNU_TYPE at -qmake \
+	PKG_CONFIG=@DEB_HOST_GNU_TYPE at -pkg-config \
+	-before \
+	"$@"
diff --git a/debian/rules b/debian/rules
index f8dd58f..6bec003 100755
--- a/debian/rules
+++ b/debian/rules
@@ -261,18 +261,9 @@ endif
 		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
 
 	mkdir -p debian/tmp/usr/bin
-	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
+	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+		-e 's/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g' \
+		< debian/qmake-cross-wrapper.in > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
 	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
 
 override_dh_auto_install-indep:

-- 
qtbase packaging