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 <mvernon@wikimedia.org>

diff --git a/debian/control b/debian/control
index b17eb347d9a309ef6ca4a1a234a07840d5f21edd..3b0e9e9ef2969c56860432c898d82d1fd42b9f7c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,7 @@ Build-Depends: automake,
                git,
                golang,
                gperf,
-               g++ (>= 7),
-               hostname <pkg.ceph.check>,
+               g++ (>= 11),
                javahelper,
                jq <pkg.ceph.check>,
                jsonnet <pkg.ceph.check>,

diff --git a/debian/rules b/debian/rules
index c163daad2c2a8bb6ba8f3f0285bc2672a21bdd0d..347a4638aaca12675b02b37a32e951926d1e9492 100755 (executable)
--- 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