[neon/qt6/qt6-quickeffectmaker/Neon/release] debian: add lto and tidy up

Carlos De Maine null at kde.org
Mon Oct 23 02:49:22 BST 2023


Git commit 7e805b47a1473e02fc76586b1a79728f83d6ca40 by Carlos De Maine.
Committed on 23/10/2023 at 03:49.
Pushed by carlosdem into branch 'Neon/release'.

add lto and tidy up

M  +3    -3    debian/control
M  +10   -8    debian/rules

https://invent.kde.org/neon/qt6/qt6-quickeffectmaker/-/commit/7e805b47a1473e02fc76586b1a79728f83d6ca40

diff --git a/debian/control b/debian/control
index b211e18..79c3d51 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,6 @@ Breaks: qt6-qtquickeffectmaker
 Replaces: qt6-qtquickeffectmaker
 Description: Qt Quick Effect Maker
  Qt Quick Effect Maker is a tool for creating shader effects for Qt
-  Quick with high productivity and performance. You can run Qt Quick
-   Effect Maker as a standalone tool but it is also included in Qt 
-   Design Studio.
+ Quick with high productivity and performance. You can run Qt Quick
+ Effect Maker as a standalone tool but it is also included in Qt
+ Design Studio.
diff --git a/debian/rules b/debian/rules
index 92c5f80..cb84539 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,12 @@
 
 include /usr/share/dpkg/architecture.mk
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+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))
+	cmake_extra_args += -DQT_HOST_PATH=/usr
+endif
 
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
@@ -10,12 +15,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--log-level=STATUS \
-		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+		$(cmake_extra_args)
 
-# no solibs at present
-#execute_after_dh_auto_install:
+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
-
-override_dh_install:
-	:
+	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