[neon/qt6/qt6-speech/Neon/release] debian: revert rules to salsa magic

Carlos De Maine null at kde.org
Wed May 10 10:57:37 BST 2023


Git commit 3ffb1b2ad34e8b5a2f4a4bf0d0309e7bc2ed2f57 by Carlos De Maine.
Committed on 10/05/2023 at 09:57.
Pushed by carlosdem into branch 'Neon/release'.

revert rules to salsa magic

M  +3    -9    debian/rules

https://invent.kde.org/neon/qt6/qt6-speech/commit/3ffb1b2ad34e8b5a2f4a4bf0d0309e7bc2ed2f57

diff --git a/debian/rules b/debian/rules
index 0163e4f..e668b20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,7 @@
 #!/usr/bin/make -f
-
 include /usr/share/dpkg/architecture.mk
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto
-
-# QT_HOST_PATH isn't passed in cross-builds
-ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	extra_cmake_args += -DQT_HOST_PATH=/usr
-endif
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
@@ -15,10 +9,10 @@ endif
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--log-level=STATUS \
-		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-		$(extra_cmake_args)
+		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 
 execute_after_dh_auto_install:
 	# 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
 
+


More information about the Neon-commits mailing list