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

Bug#1033647: qt6-connectivity FTCBFS: does not pass QT_HOST_PATH to cmake



Source: qt6-connectivity
Version: 6.4.2-1
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs

Hi,

qt6-connectivity is another package that misses QT_HOST_PATH. I've
attached the obvious patch.

Helmut
diff --minimal -Nru qt6-connectivity-6.4.2/debian/changelog qt6-connectivity-6.4.2/debian/changelog
--- qt6-connectivity-6.4.2/debian/changelog	2023-01-22 11:20:28.000000000 +0100
+++ qt6-connectivity-6.4.2/debian/changelog	2023-03-29 09:57:30.000000000 +0200
@@ -1,3 +1,10 @@
+qt6-connectivity (6.4.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH to cmake. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Wed, 29 Mar 2023 09:57:30 +0200
+
 qt6-connectivity (6.4.2-1) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-connectivity-6.4.2/debian/rules qt6-connectivity-6.4.2/debian/rules
--- qt6-connectivity-6.4.2/debian/rules	2023-01-22 11:17:11.000000000 +0100
+++ qt6-connectivity-6.4.2/debian/rules	2023-03-29 09:57:26.000000000 +0200
@@ -4,13 +4,20 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+extra_cmake_args=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
+
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--log-level=STATUS \
-		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+		$(extra_cmake_args)
 
 execute_after_dh_auto_install:
 	# Reproducible builds: remove build paths from .prl files

Reply to: