Package: cdbs Version: 0.4.158 Tags: patch User: helm...@debian.org Usertags: rebootstrap Control: affects -1 + src:jacktrip
cdbs's qmake.mk defaults to using plain qmake. That's the right thing to do for native builds, but for cross builds it should be prefixed (just like gcc, binutils, pkg-config, etc.). The attached patch implements that. Please consider applying it. Helmut
diff --minimal -Nru cdbs-0.4.158/1/class/qmake.mk.in cdbs-0.4.158+nmu1/1/class/qmake.mk.in --- cdbs-0.4.158/1/class/qmake.mk.in 2016-06-10 12:36:00.000000000 +0200 +++ cdbs-0.4.158+nmu1/1/class/qmake.mk.in 2019-01-02 08:00:03.000000000 +0100 @@ -31,7 +31,11 @@ DEB_MAKE_INSTALL_TARGET = install INSTALL_ROOT=$(DEB_DESTDIR) DEB_MAKE_CLEAN_TARGET = distclean +ifeq (,$(cdbs_crossbuild)) QMAKE ?= qmake +else +QMAKE ?= $(DEB_HOST_GNU_TYPE)-qmake +endif ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) DEB_QMAKE_CONFIG_VAL ?= nostrip diff --minimal -Nru cdbs-0.4.158/debian/changelog cdbs-0.4.158+nmu1/debian/changelog --- cdbs-0.4.158/debian/changelog 2018-09-23 14:17:02.000000000 +0200 +++ cdbs-0.4.158+nmu1/debian/changelog 2019-01-02 08:00:45.000000000 +0100 @@ -1,3 +1,10 @@ +cdbs (0.4.158+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use a cross qmake for cross building. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Wed, 02 Jan 2019 08:00:45 +0100 + cdbs (0.4.158) unstable; urgency=medium * Fix update Maintainer address.
