Bug#886656: qbs FTCBFS: runs host tools for test setup despite DEB_BUILD_OPTIONS=nocheck
Source: qbs
Version: 1.10.0+dfsg-2
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
qbs fails to cross build from source, because it only partially honouars
DEB_BUILD_OPTIONS=nocheck. Before checking it through dh_auto_test, it
runs some host tools and fails doing so during cross builds. After
properly supporting nocheck, qbs cross builds successfully. Please
consider applying the attached patch.
Helmut
diff --minimal -Nru qbs-1.10.0+dfsg/debian/changelog qbs-1.10.0+dfsg/debian/changelog
--- qbs-1.10.0+dfsg/debian/changelog 2017-12-22 20:12:20.000000000 +0100
+++ qbs-1.10.0+dfsg/debian/changelog 2018-01-08 15:54:29.000000000 +0100
@@ -1,3 +1,10 @@
+qbs (1.10.0+dfsg-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Properly support DEB_BUILD_OPTIONS=nocheck. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Mon, 08 Jan 2018 15:54:29 +0100
+
qbs (1.10.0+dfsg-2) unstable; urgency=medium
* Update symbols files from builddsâ?? logs.
diff --minimal -Nru qbs-1.10.0+dfsg/debian/rules qbs-1.10.0+dfsg/debian/rules
--- qbs-1.10.0+dfsg/debian/rules 2017-12-22 20:12:20.000000000 +0100
+++ qbs-1.10.0+dfsg/debian/rules 2018-01-08 15:54:27.000000000 +0100
@@ -38,6 +38,7 @@
dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_inst_html_docs
dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp sub-static-pro-install_subtargets
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
override_dh_auto_test-arch:
set -ex; \
export LD_LIBRARY_PATH=$(CURDIR)/lib/${DEB_HOST_MULTIARCH}:$$LD_LIBRARY_PATH; \
@@ -50,6 +51,7 @@
LC_ALL=C.UTF-8 dh_auto_test
override_dh_auto_test-indep:
+endif
override_dh_install:
rm -fv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libqbscore.so.1
Reply to: