[neon/qt6/qt6-base/Neon/unstable] debian: new rules

Carlos De Maine null at kde.org
Fri Oct 27 04:15:05 BST 2023


Git commit 5a288bf56b58ffb674ce0abe355a2578d0749ae8 by Carlos De Maine.
Committed on 27/10/2023 at 05:14.
Pushed by carlosdem into branch 'Neon/unstable'.

new rules

M  +2    -0    debian/control
M  +47   -43   debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/5a288bf56b58ffb674ce0abe355a2578d0749ae8

diff --git a/debian/control b/debian/control
index d374b32..7b2cad1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,8 @@ Build-Depends: cmake,
                default-libmysqlclient-dev,
                dh-exec,
                firebird-dev [linux-any],
+               glslang-tools,
+#               glslc,
                libatspi2.0-dev,
                libb2-dev,
                libbrotli-dev,
diff --git a/debian/rules b/debian/rules
index c0928fe..a19d4e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,9 @@
 # Use already defined DEB_HOST_* variables.
 include /usr/share/dpkg/architecture.mk
 
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto -fuse-ld=mold
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
+
 sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
 
 ifneq (,$(filter libqt6sql6-ibase,$(shell dh_listpackages)))
@@ -30,64 +32,66 @@ endif
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
+#		-DFEATURE_use_lld_linker=ON \
+#		-DFEATURE_enable_gdb_index=ON \
+
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--log-level=STATUS \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-		-DCMAKE_UNITY_BUILD=TRUE \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DINSTALL_BINDIR=lib/qt6/bin \
-		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
-		-DINSTALL_LIBEXECDIR=lib/qt6/libexec \
-		-DINSTALL_ARCHDATADIR=lib/$(DEB_HOST_MULTIARCH)/qt6 \
-		-DINSTALL_EXAMPLESDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/examples \
-		-DINSTALL_DATADIR=share/qt6 \
-		-DINSTALL_HOSTDATADIR=lib/$(DEB_HOST_MULTIARCH)/qt6 \
-		-DINSTALL_DOCDIR=share/qt6/doc \
-		-DINSTALL_SYSCONFDIR=/etc/xdg \
-		-DINSTALL_INCLUDEDIR=include/$(DEB_HOST_MULTIARCH)/qt6 \
-		-DINSTALL_PLUGINDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/plugins \
-		-DINSTALL_TRANSLATIONDIR=share/qt6/translations \
-		-DINSTALL_MKSPECSDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/mkspecs \
-		-DINSTALL_PUBLICBINDIR=bin \
-		-DBUILD_EXAMPLES=ON \
-		-DFEATURE_mimetype_database=OFF \
-		-DFEATURE_dbus_linked=ON \
+		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DFEATURE_accessibility=ON \
-		-DFEATURE_doubleconversion=ON \
-		-DFEATURE_glib=ON \
-		-DFEATURE_icu=ON \
-		-DFEATURE_pcre2=ON \
-		-DFEATURE_system_pcre2=ON \
-		-DFEATURE_zlib=ON \
-		-DFEATURE_ssl=ON \
-		-DFEATURE_libproxy=ON \
-		-DFEATURE_system_proxies=ON \
 		-DFEATURE_cups=ON \
-		-DFEATURE_fontconfig=ON \
+		-DFEATURE_directfb=OFF \
+		-DFEATURE_dbus_linked=ON \
+		-DFEATURE_doubleconversion=ON \
 		-DFEATURE_freetype=ON \
+		-DFEATURE_fontconfig=ON \
+		-DFEATURE_glib=ON \
 		-DFEATURE_harfbuzz=ON \
-		-DFEATURE_gtk=ON \
-		-DFEATURE_directfb=OFF \
+		-DFEATURE_icu=ON \
+		-DFEATURE_jpeg=ON \
 		-DFEATURE_journald=ON \
-		-DFEATURE_sql_odbc=ON \
+		-DFEATURE_libproxy=ON \
+		-DFEATURE_ltcg=ON \
+		-DFEATURE_lttng=ON \
+		-DFEATURE_mimetype_database=OFF \
+		-DFEATURE_pcre2=ON \
+		-DFEATURE_png=ON -DFEATURE_system_png=ON \
+		-DFEATURE_reduce_relocations=OFF \
+		-DFEATURE_relocatable=OFF \
+		-DFEATURE_rpath=OFF \
+		-DFEATURE_separate_debug_info=on \
 		-DFEATURE_sql_mysql=ON \
+		-DFEATURE_sql_odbc=ON \
 		-DFEATURE_sql_psql=ON \
-		-DFEATURE_sql_sqlite=ON \
-		-DFEATURE_system_sqlite=ON \
-		-DFEATURE_jpeg=ON \
+		-DFEATURE_sql_sqlite=ON -DFEATURE_system_sqlite=ON \
+		-DFEATURE_ssl=ON \
 		-DFEATURE_system_jpeg=ON \
-		-DFEATURE_png=ON \
-		-DFEATURE_system_png=ON \
 		-DFEATURE_system_libb2=ON \
+		-DFEATURE_system_proxies=ON \
+		-DFEATURE_system_pcre2=ON \
 		-DFEATURE_system_xcb_xinput=ON \
-		-DFEATURE_rpath=OFF \
-		-DFEATURE_relocatable=OFF \
-		-DFEATURE_reduce_relocations=OFF \
-		-DFEATURE_trace=lttng \
-		-DFEATURE_unity-build=ON \
+		-DFEATURE_system_zlib=ON \
+		-DINSTALL_ARCHDATADIR=lib/$(DEB_HOST_MULTIARCH)/qt6 \
+		-DINSTALL_BINDIR=lib/qt6/bin \
+		-DINSTALL_EXAMPLESDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/examples \
+		-DINSTALL_DATADIR=share/qt6 \
+		-DINSTALL_DOCDIR=share/qt6/doc \
+		-DINSTALL_HOSTDATADIR=lib/$(DEB_HOST_MULTIARCH)/qt6 \
+		-DINSTALL_INCLUDEDIR=include/$(DEB_HOST_MULTIARCH)/qt6 \
+		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_LIBEXECDIR=lib/qt6/libexec \
+		-DINSTALL_MKSPECSDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/mkspecs \
+		-DINSTALL_PUBLICBINDIR=bin \
+		-DINSTALL_PLUGINDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/plugins \
+		-DINSTALL_SYSCONFDIR=/etc/xdg \
+		-DINSTALL_TRANSLATIONDIR=share/qt6/translations \
+		-DQT_BUILD_EXAMPLES=ON \
+		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
 execute_after_dh_auto_install-arch:


More information about the Neon-commits mailing list