[neon/qt6/qt6-base/Neon/release] debian: see if the ubports way works

Carlos De Maine null at kde.org
Wed Dec 4 23:26:53 GMT 2024


Git commit 4423e6e2eb3cd6c569c0babcb511daa8eb5e7b14 by Carlos De Maine.
Committed on 04/12/2024 at 23:26.
Pushed by carlosdem into branch 'Neon/release'.

see if the ubports way works

M  +7    -7    debian/rules

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

diff --git a/debian/rules b/debian/rules
index f6c214d..7b819f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,18 +7,18 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 #### uncomment when bootstrapping a new qt release ####
-export DEB_BUILD_PROFILES='nodoc'
-
-export DEB_BUILD_OPTIONS='nodoc'
+DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS} nodoc"
+DEB_BUILD_PROFILES="${DEB_BUILD_PROFILES} nodoc"
+export DEB_BUILD_OPTIONS DEB_BUILD_PROFILES
 
 sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
 
-ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
-	extra_build_args +=
-	extra_install_args +=
-else
+ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
 	extra_build_args += docs
 	extra_install_args += install_docs
+else
+	extra_build_args +=
+	extra_install_args +=
 endif
 
 ifneq (,$(filter libqt6sql6-ibase,$(shell dh_listpackages)))


More information about the Neon-commits mailing list