[neon/qt6/qt6-virtualkeyboard/Neon/release] debian: Revert "need gcc 12.1 for mold to be able to process --gdb-index"

Carlos De Maine null at kde.org
Sat Oct 28 13:46:09 BST 2023


Git commit 63dd974c6f601c38e1f313e0669c1805dede5ef4 by Carlos De Maine.
Committed on 28/10/2023 at 14:46.
Pushed by carlosdem into branch 'Neon/release'.

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

This reverts commit 93c0423a81fedc46035bf489df717bf2fe837611.

M  +0    -3    debian/control
M  +1    -7    debian/rules

https://invent.kde.org/neon/qt6/qt6-virtualkeyboard/-/commit/63dd974c6f601c38e1f313e0669c1805dede5ef4

diff --git a/debian/control b/debian/control
index ff6de85..e0790f6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ 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,
                hunspell-en-gb <!nocheck>,
                libgl-dev,
                libhunspell-dev,
@@ -14,7 +12,6 @@ Build-Depends: cmake,
                libvulkan-dev [linux-any],
                libxcb-xfixes0-dev,
                libxkbcommon-dev,
-               mold,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
diff --git a/debian/rules b/debian/rules
index 666e42d..5267a95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,6 @@ 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
@@ -27,10 +23,8 @@ endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
+		--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