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

Carlos De Maine null at kde.org
Sat Oct 28 13:27:57 BST 2023


Git commit 381611d4c37b05796c41710db3fbe0538fee9431 by Carlos De Maine.
Committed on 28/10/2023 at 14:27.
Pushed by carlosdem into branch 'Neon/release'.

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

M  +3    -1    debian/control
M  +5    -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-wayland/-/commit/381611d4c37b05796c41710db3fbe0538fee9431

diff --git a/debian/control b/debian/control
index e4c70b0..9374714 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,8 @@ Uploaders: Patrick Franz <deltaone at debian.org>,
            Simon Quigley <tsimonq2 at debian.org>
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               g++-12,
+               gcc-12,
                libdrm-dev,
                libegl1-mesa-dev,
                libfontconfig1-dev,
@@ -16,7 +18,7 @@ Build-Depends: cmake,
                libwayland-dev (>= 1.8.0),
                libxcomposite-dev,
                libxkbcommon-dev,
-               libxkbcommon-dev (>= 0.2.0),
+               mold,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
diff --git a/debian/rules b/debian/rules
index ec96caf..b402ca4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,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 += \
@@ -17,9 +21,8 @@ endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--log-level=STATUS \
+		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-		-DFEATURE_reduce_relocations=OFF \
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)


More information about the Neon-commits mailing list