[neon/qt6/qt6-serialport/Neon/release] debian: cludge it

Carlos De Maine null at kde.org
Mon Oct 28 06:23:48 GMT 2024


Git commit 8f0e4559a8821b2022cbf0d58ac9f3439070359c by Carlos De Maine.
Committed on 28/10/2024 at 06:23.
Pushed by carlosdem into branch 'Neon/release'.

cludge it

M  +16   -10   debian/rules

https://invent.kde.org/neon/qt6/qt6-serialport/-/commit/8f0e4559a8821b2022cbf0d58ac9f3439070359c

diff --git a/debian/rules b/debian/rules
index 829d402..b55b4be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,23 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
-# cross-builds
+#### uncomment when bootstrapping a new qt release ####
+#export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
+
+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
+endif
+
+# QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	extra_cmake_args += -DQT_HOST_PATH=/usr
+	cmake_extra_args += \
+		-DQT_HOST_PATH=/usr \
+		-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
+		-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
 endif
 
 %:
@@ -20,13 +34,6 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
-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
 
@@ -35,7 +42,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' {} \;
-endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list