[neon/qt6/qt6-base/Neon/unstable] debian: pass $(extra_build_args)

Carlos De Maine null at kde.org
Wed Dec 4 22:08:17 GMT 2024


Git commit 403859ca5721844407c59e94b559b73733193754 by Carlos De Maine.
Committed on 04/12/2024 at 22:08.
Pushed by carlosdem into branch 'Neon/unstable'.

pass $(extra_build_args)

M  +8    -11   debian/rules

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

diff --git a/debian/rules b/debian/rules
index df56215..031dfc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,18 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 #### uncomment when bootstrapping a new qt release ####
 export DEB_BUILD_PROFILES='nodoc'
-$(info $$DEB_BUILD_PROFILES is [${DEB_BUILD_PROFILES }])
+echo $DEB_BUILD_PROFILES
 export DEB_BUILD_OPTIONS='nodoc'
 $(info $$DEB_BUILD_OPTIONS is [${DEB_BUILD_OPTIONS }])
 
-
 sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
 
+ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
+	extra_build_args +=
+else
+	extra_build_args += -- docs
+endif
+
 ifneq (,$(filter libqt6sql6-ibase,$(shell dh_listpackages)))
         extra_cmake_args += -DFEATURE_sql_ibase=ON
 else
@@ -103,16 +108,8 @@ 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
-endif
-
 override_dh_auto_build-indep:
-	dh_auto_build -- docs
+	dh_auto_build $(extra_build_args)
 
 override_dh_auto_install-indep:
 	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs


More information about the Neon-commits mailing list