From ab27109dd2e88c6e1082a346b3be8444697297c6 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 25 Jul 2023 21:22:29 +0200 Subject: [PATCH 1/1] compile with GCC 12 not 11 i.e., the current default in Bookworm. Signed-off-by: Thomas Lamprecht --- .../0013-d-rules-compile-with-gcc-12.patch | 23 +++++++++++++++++++ patches/series | 1 + 2 files changed, 24 insertions(+) create mode 100644 patches/0013-d-rules-compile-with-gcc-12.patch diff --git a/patches/0013-d-rules-compile-with-gcc-12.patch b/patches/0013-d-rules-compile-with-gcc-12.patch new file mode 100644 index 000000000..63b9b7f4c --- /dev/null +++ b/patches/0013-d-rules-compile-with-gcc-12.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thomas Lamprecht +Date: Tue, 25 Jul 2023 21:05:18 +0200 +Subject: [PATCH] d/rules: compile with gcc 12 + +Signed-off-by: Thomas Lamprecht +--- + debian/rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debian/rules b/debian/rules +index c163daad2..a1653cb74 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -5,7 +5,7 @@ export DESTDIR=$(CURDIR)/debian/tmp + + include /usr/share/dpkg/default.mk + +-extraopts += -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 ++extraopts += -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 + ifneq (,$(findstring WITH_STATIC_LIBSTDCXX,$(CEPH_EXTRA_CMAKE_ARGS))) + # dh_auto_build sets LDFLAGS with `dpkg-buildflags --get LDFLAGS` on ubuntu, + # which makes the application aborts when the shared library throws diff --git a/patches/series b/patches/series index 195954bd1..d1b233eaf 100644 --- a/patches/series +++ b/patches/series @@ -10,3 +10,4 @@ 0010-d-control-drop-outdated-build-dependencies-and-bump-.patch 0011-d-rules-fix-no-restart-on-upgrade.patch 0012-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch +0013-d-rules-compile-with-gcc-12.patch -- 2.39.2