Source: qt6-5compat
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-5compat fails to cross build from source, because QT_HOST_PATH isn't
passed. I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru qt6-5compat-6.3.1/debian/changelog 
qt6-5compat-6.3.1/debian/changelog
--- qt6-5compat-6.3.1/debian/changelog  2022-08-15 19:22:22.000000000 +0200
+++ qt6-5compat-6.3.1/debian/changelog  2022-10-28 18:15:11.000000000 +0200
@@ -1,3 +1,10 @@
+qt6-5compat (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Set qt6-specific cross variables. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Fri, 28 Oct 2022 18:15:11 +0200
+
 qt6-5compat (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-5compat-6.3.1/debian/rules 
qt6-5compat-6.3.1/debian/rules
--- qt6-5compat-6.3.1/debian/rules      2021-11-29 07:30:03.000000000 +0100
+++ qt6-5compat-6.3.1/debian/rules      2022-10-28 18:15:09.000000000 +0200
@@ -7,9 +7,16 @@
 %:
        dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
+CMAKE_FLAGS = -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+CMAKE_FLAGS += \
+       -DQT_HOST_PATH=/usr \
+       -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/cmake
+endif
+
 override_dh_auto_configure:
-       dh_auto_configure -- \
-               -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+       dh_auto_configure -- $(CMAKE_FLAGS)
 
 execute_after_dh_auto_install:
        # Reproducible builds: remove build paths from .prl files

Reply via email to