[neon/extras/qca2/Neon/stable] debian: rules: factorize common vars

Pino Toscano null at kde.org
Tue Dec 13 14:39:25 GMT 2022


Git commit ef542b3e99652e7864d12e08ca4a8eaa6913927f by Pino Toscano.
Committed on 22/10/2022 at 10:56.
Pushed by carlosdem into branch 'Neon/stable'.

rules: factorize common vars

M  +2    -0    debian/changelog
M  +4    -1    debian/rules

https://invent.kde.org/neon/extras/qca2/commit/ef542b3e99652e7864d12e08ca4a8eaa6913927f

diff --git a/debian/changelog b/debian/changelog
index ed82320..919ca19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ qca2 (2.3.5-0r1) UNRELEASED; urgency=medium
   * Update the patches:
     - define_qca_export.diff: drop, fixed upstream
     - pipeunittest_more_wait.diff: refresh
+  * Factorize the common cmake arguments for different Qt versions in a single
+    variable.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Oct 2022 12:29:54 +0200
 
diff --git a/debian/rules b/debian/rules
index cc3bb22..95866e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,15 @@ export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidd
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 
+COMMON_CMAKE_ARGS = -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
+
 %:
 	dh $@ --builddirectory=build
 
 override_dh_auto_configure:
 	QT_SELECT=qt5 dh_auto_configure --builddirectory=build -- \
-	    -DQT5_BUILD=ON -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
+	    $(COMMON_CMAKE_ARGS) \
+	    -DQT5_BUILD=ON \
 	    -DQCA_FEATURE_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features"
 
 override_dh_auto_build-arch:



More information about the Neon-commits mailing list