[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#883943: qtquickcontrols2-opensource-src FTCBFS: does not pass cross tools to qmake



Source: qtquickcontrols2-opensource-src
Version: 5.9.2-2
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

qtquickcontrols2-opensource-src fails to cross build from source,
because it does not pass cross tools to qmake. Nowadays, debhelper
should handle that task and simply deferring it to dh_auto_configure
makes the cross build succeed. Please consider applying the attached.

Helmut
diff --minimal -Nru qtquickcontrols2-opensource-src-5.9.2/debian/changelog qtquickcontrols2-opensource-src-5.9.2/debian/changelog
--- qtquickcontrols2-opensource-src-5.9.2/debian/changelog	2017-10-26 16:54:37.000000000 +0200
+++ qtquickcontrols2-opensource-src-5.9.2/debian/changelog	2017-12-09 19:03:39.000000000 +0100
@@ -1,3 +1,11 @@
+qtquickcontrols2-opensource-src (5.9.2-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fixt FTCBFS: Let dh_auto_configure pass cross flags to qmake. (Closes:
+    #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sat, 09 Dec 2017 19:03:39 +0100
+
 qtquickcontrols2-opensource-src (5.9.2-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --minimal -Nru qtquickcontrols2-opensource-src-5.9.2/debian/control qtquickcontrols2-opensource-src-5.9.2/debian/control
--- qtquickcontrols2-opensource-src-5.9.2/debian/control	2017-10-26 16:54:37.000000000 +0200
+++ qtquickcontrols2-opensource-src-5.9.2/debian/control	2017-12-09 19:03:36.000000000 +0100
@@ -8,7 +8,7 @@
            Timo Jyrinki <timo@debian.org>,
            Dmitry Shachnev <mitya57@debian.org>,
            Simon Quigley <tsimonq2@ubuntu.com>
-Build-Depends: debhelper (>= 10.3),
+Build-Depends: debhelper (>= 10.9.2~),
                dpkg-dev (>= 1.16.1),
                pkg-kde-tools (>= 0.15.26~),
                qml-module-qtgraphicaleffects (>= 5.9.2~),
diff --minimal -Nru qtquickcontrols2-opensource-src-5.9.2/debian/rules qtquickcontrols2-opensource-src-5.9.2/debian/rules
--- qtquickcontrols2-opensource-src-5.9.2/debian/rules	2017-10-26 16:54:37.000000000 +0200
+++ qtquickcontrols2-opensource-src-5.9.2/debian/rules	2017-12-09 19:02:38.000000000 +0100
@@ -4,12 +4,13 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export QT_SELECT = qt5
 
 %:
 	dh $@ --with pkgkde_symbolshelper,qmlcdeps
 
 override_dh_auto_configure:
-	qmake -qt5 QT_BUILD_PARTS+=tests
+	dh_auto_configure -- QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs

Reply to: