[neon/qt6/qt6-tools/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 13:25:48 BST 2023


Git commit d5a119b22b4ab3bf9e33f5be528c7cab311d08a5 by Carlos De Maine.
Committed on 28/10/2023 at 14:25.
Pushed by carlosdem into branch 'Neon/unstable'.

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

M  +4    -0    debian/control
M  +7    -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/d5a119b22b4ab3bf9e33f5be528c7cab311d08a5

diff --git a/debian/control b/debian/control
index c3ac40a..6a46e49 100644
--- a/debian/control
+++ b/debian/control
@@ -6,16 +6,20 @@ Uploaders: Patrick Franz <deltaone at debian.org>
 Build-Depends: clang-14,
                cmake,
                debhelper-compat (= 13),
+               g++-12,
+               gcc-12,
                libclang-14-dev,
                libgl-dev,
 #               liblitehtml-dev,
                libssl-dev,
                libvulkan-dev [linux-any],
                libxcb-xkb-dev,
+               llvm,
                llvm-14,
                llvm-14-dev,
                libxkbcommon-dev,
                libzstd-dev,
+               mold,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
diff --git a/debian/rules b/debian/rules
index 0562a12..fc342d2 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
+
 export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
 
 %:
@@ -10,12 +14,11 @@ export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--log-level=STATUS \
+		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-		-DCMAKE_SKIP_INSTALL_RPATH=ON \
-		-DFEATURE_reduce_relocations=OFF \
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-		-DCMAKE_UNITY_BUILD=ON
+		-DQT_UNITY_BUILD=ON \
+		$(extra_cmake_args)
 
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info


More information about the Neon-commits mailing list