Package: debhelper
Version: 13.11.9
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:xaos
Hi Niels,
I uploaded my qmake6 buildsystem, but when I did, I forgot that cross
build support is needed in there and not inherited from qmake (qt5). So
I need another change for cross build support.
Helmut
diff --minimal -Nru debhelper-13.11.9/debian/changelog
debhelper-13.11.10/debian/changelog
--- debhelper-13.11.9/debian/changelog 2023-12-19 11:28:16.000000000 +0100
+++ debhelper-13.11.10/debian/changelog 2023-12-21 10:52:05.000000000 +0100
@@ -1,3 +1,9 @@
+debhelper (13.11.10) UNRELEASED; urgency=medium
+
+ * Add cross compilation support to --buildsystem=qmake6. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 21 Dec 2023 10:52:05 +0100
+
debhelper (13.11.9) unstable; urgency=medium
* Team upload.
diff --minimal -Nru
debhelper-13.11.9/lib/Debian/Debhelper/Buildsystem/qmake6.pm
debhelper-13.11.10/lib/Debian/Debhelper/Buildsystem/qmake6.pm
--- debhelper-13.11.9/lib/Debian/Debhelper/Buildsystem/qmake6.pm
2023-12-19 11:28:16.000000000 +0100
+++ debhelper-13.11.10/lib/Debian/Debhelper/Buildsystem/qmake6.pm
2023-12-21 10:52:02.000000000 +0100
@@ -2,6 +2,7 @@
use strict;
use warnings;
+use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value is_cross_compiling);
use parent qw(Debian::Debhelper::Buildsystem::qmake);
sub DESCRIPTION {
@@ -9,6 +10,9 @@
}
sub _qmake {
+ if (is_cross_compiling()) {
+ return dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-qmake6";
+ }
return 'qmake6';
}
