[neon/qt6/qt6-languageserver/Neon/release] debian: Pass QT_HOST_PATH to cmake in cross-builds, thx to Helmut Grohne (Closes: #1023188).
Patrick Franz
null at kde.org
Tue Dec 6 11:59:46 GMT 2022
Git commit 2b716c2eaea635025cd2a9affda4429d26d78106 by Patrick Franz.
Committed on 04/11/2022 at 19:17.
Pushed by jriddell into branch 'Neon/release'.
Pass QT_HOST_PATH to cmake in cross-builds, thx to Helmut Grohne (Closes: #1023188).
M +4 -0 debian/changelog
M +7 -2 debian/rules
https://invent.kde.org/neon/qt6/qt6-languageserver/commit/2b716c2eaea635025cd2a9affda4429d26d78106
diff --git a/debian/changelog b/debian/changelog
index c2163b5..16936e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
qt6-languageserver (6.4.0-2) UNRELEASED; urgency=medium
+ [ Patrick Franz ]
+ * Pass QT_HOST_PATH to cmake in cross-builds, thx to Helmut Grohne
+ (Closes: #1023188).
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 04 Nov 2022 20:08:39 +0100
qt6-languageserver (6.4.0-1) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index 7ee6daf..e107f98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,23 @@
#!/usr/bin/make -f
-#export DH_VERBOSE = 1
# Use already defined DEB_HOST_* variables.
include /usr/share/dpkg/architecture.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# QT_HOST_PATH isn't passed in cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+ cmake_extra_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) \
+ $(cmake_extra_args)
execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files
More information about the Neon-commits
mailing list