[neon/qt6/qt6-base/Neon/release] debian: set qt_host_path even though no crossbuild

Carlos De Maine null at kde.org
Thu Dec 14 13:03:17 GMT 2023


Git commit 97273c50802c8926365fc99c5f83851e75acd599 by Carlos De Maine.
Committed on 14/12/2023 at 14:03.
Pushed by carlosdem into branch 'Neon/release'.

set qt_host_path even though no crossbuild

M  +0    -1    debian/qt.conf.in
M  +3    -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/97273c50802c8926365fc99c5f83851e75acd599

diff --git a/debian/qt.conf.in b/debian/qt.conf.in
index 6d2b9b3..ea99272 100644
--- a/debian/qt.conf.in
+++ b/debian/qt.conf.in
@@ -12,6 +12,5 @@ Libraries=lib/@DEB_HOST_MULTIARCH@
 LibraryExecutables=lib/qt6/libexec
 Plugins=lib/@DEB_HOST_MULTIARCH@/qt6/plugins
 Qml2Imports=lib/@DEB_HOST_MULTIARCH@/qt6/qml
-QtDir=/usr
 Settings=/etc/xdg
 Translations=share/qt6/translations
diff --git a/debian/rules b/debian/rules
index cd10be0..610a8cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,7 +100,8 @@ override_dh_auto_configure:
 		-DINSTALL_SYSCONFDIR=/etc/xdg \
 		-DINSTALL_TRANSLATIONDIR=share/qt6/translations \
 		-DQT_BUILD_EXAMPLES=ON \
-		-DQT_DIR=/usr \
+		-DQT_FORCE_FIND_TOOLS=ON \
+		_DQT_HOST_PATH=/usr \
 		-DQT_INSTALL_EXAMPLES_SOURCES=ON \
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
@@ -126,7 +127,7 @@ execute_after_dh_auto_install-arch:
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-relwithdebinfo.cmake
 
 override_dh_auto_build-indep:
-	dh_auto_build #-- docs
+	dh_auto_build -- docs
 
 override_dh_auto_install-indep:
 	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs


More information about the Neon-commits mailing list