[neon/qt6/qt6-location/Neon/unstable] debian: need gcc 12.1 for mold to be able to process --gdb-index

Carlos De Maine null at kde.org
Sat Oct 28 14:19:21 BST 2023


Git commit 859aafc62ef2401ccff4b4982470470d70eee8c5 by Carlos De Maine.
Committed on 28/10/2023 at 15:19.
Pushed by carlosdem into branch 'Neon/unstable'.

need gcc 12.1 for mold to be able to process --gdb-index

M  +3    -0    debian/control
M  +0    -10   debian/not-installed
M  +7    -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-location/-/commit/859aafc62ef2401ccff4b4982470470d70eee8c5

diff --git a/debian/control b/debian/control
index 3e19d8b..97860b0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,14 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               g++-12,
+               gcc-12,
                libgconf2-dev,
                libgl-dev,
                libssl-dev,
                libvulkan-dev [linux-any],
                libxkbcommon-dev,
+               mold,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
diff --git a/debian/not-installed b/debian/not-installed
index 82c171d..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,10 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/6.*
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_location_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_locationquick_private.pri
diff --git a/debian/rules b/debian/rules
index dba1943..e2abeb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,10 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+# need gcc 12.1 for mold to be able to process --gdb-index
+export CC=gcc-12
+export CXX=g++-12
+
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += -DQT_HOST_PATH=/usr
@@ -13,8 +17,10 @@ endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--log-level=STATUS \
+		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
 override_dh_auto_build-indep:


More information about the Neon-commits mailing list