[neon/qt6/qt6-location/Neon/release] debian: simplify the logic

Carlos De Maine null at kde.org
Mon Oct 28 01:05:14 GMT 2024


Git commit 3cfffd50007673bfcc13d1f5a764e9401bef27b4 by Carlos De Maine.
Committed on 28/10/2024 at 01:05.
Pushed by carlosdem into branch 'Neon/release'.

simplify the logic

M  +11   -8    debian/rules

https://invent.kde.org/neon/qt6/qt6-location/-/commit/3cfffd50007673bfcc13d1f5a764e9401bef27b4

diff --git a/debian/rules b/debian/rules
index 82873b9..4d7c83e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	extra_cmake_args += -DQT_HOST_PATH=/usr
+	extra_cmake_args += \
+		-DQT_HOST_PATH=/usr \
+		-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
+		-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
 endif
 
 %:
@@ -22,7 +25,13 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
-ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+override_dh_auto_build-indep:
+	dh_auto_build
+
+override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+else
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 
@@ -31,12 +40,6 @@ override_dh_auto_install-indep:
 	# Remove build path from index files.
 	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
                 sed -i 's@$(CURDIR)/@@g' {} \;
-else
-override_dh_auto_build-indep:
-	dh_auto_build
-
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
 endif
 
 execute_after_dh_auto_install-arch:


More information about the Neon-commits mailing list