[neon/qt6/qt6-base/Neon/release] debian: order matters in a makefile ??

Carlos De Maine null at kde.org
Mon Oct 28 03:41:06 GMT 2024


Git commit b36b887b4c23f42e1b450ad8d9937c38b180c815 by Carlos De Maine.
Committed on 28/10/2024 at 03:40.
Pushed by carlosdem into branch 'Neon/release'.

order matters in a makefile ??

M  +19   -20   debian/rules

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

diff --git a/debian/rules b/debian/rules
index eda973c..14f7428 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,9 @@
 include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
-sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
 
-### uncomment when bootsrapping a new qt release
-#export BOOTSTRAP=ON
+#### uncomment when bootstrapping a new qt release ####
+#export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
 
 sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
 
@@ -41,7 +40,6 @@ endif
 ## tracegen: fatal: Cannot deduce CTF type for 'QImage::Format format
 ##
 
-
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -101,6 +99,23 @@ 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
+
+override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
+	# 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
 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
@@ -121,22 +136,6 @@ execute_after_dh_auto_install-arch:
 	sed -i 's,lib/qt6/bin/qmake,bin/$(DEB_HOST_GNU_TYPE)-qmake6,' \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-relwithdebinfo.cmake
 
-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
-
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
-	# 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
 
 ### no longer needed??
 override_dh_makeshlibs:


More information about the Neon-commits mailing list