From c14ed9bf1b254421d6949b62697b07aab4ea3b48 Mon Sep 17 00:00:00 2001 From: Matthew Vernon Date: Wed, 20 Sep 2023 17:43:30 +0100 Subject: [PATCH] debian: Build-Depend on g++ 11 or greater Rely on the packaging system to provide a suitable g++ of version 11 or greater, and removing the corresponding hard-coding from debian/rules, since cmake will then find a suitable version. This seems better than trying to hard-code a particular version in debian/rules, and Debian package building tools like e.g. sbuild will then do the right thing. This enables Reef (v18.2.0) to build on Debian bookworm in a clean chroot. Fixes: https://tracker.ceph.com/issues/61845 Signed-off-by: Matthew Vernon --- debian/control | 3 +-- debian/rules | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/control b/debian/control index b17eb347d9a..3b0e9e9ef29 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,7 @@ Build-Depends: automake, git, golang, gperf, - g++ (>= 7), - hostname , + g++ (>= 11), javahelper, jq , jsonnet , diff --git a/debian/rules b/debian/rules index c163daad2c2..347a4638aac 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,6 @@ export DESTDIR=$(CURDIR)/debian/tmp include /usr/share/dpkg/default.mk -extraopts += -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 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 -- 2.39.5