From: Radosław Zarzyński Date: Mon, 28 Mar 2022 14:38:44 +0000 (+0200) Subject: ceph.spec.in: use gcc-toolset-10 for building crimson X-Git-Tag: v18.0.0~1168^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30f75143171d5ed1ca94a1a56ce0556db17735b6;p=ceph.git ceph.spec.in: use gcc-toolset-10 for building crimson This commit bumps up the toolset version but only to build crimson. That is, the classical OSD stays unaffected. The reason behind the upgrade is the following FTBFS: ``` [ 32%] Building CXX object src/seastar/CMakeFiles/seastar.dir/src/core/reactor.cc.o /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/src/core/reactor.cc: In constructor ‘seastar::reactor::reactor(std::shared_ptr, seastar::alien::instance&, unsigned int, seastar::reactor_backend_selector, seastar::reactor_config)’: /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/src/core/reactor.cc:926:90: error: use of deleted function ‘seastar::condition_variable::condition_variable()’ 926 | , _thread_pool(std::make_unique(this, seastar::format("syscall-{}", id))) { | ^ In file included from /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/include/seastar/core/reactor.hh:74, from /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/src/core/reactor.cc:32: /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/include/seastar/core/condition-variable.hh:157:5: note: ‘seastar::condition_variable::condition_variable() noexcept’ is implicitly deleted because its exception-specification does not match the implicit exception-specification ‘’ 157 | condition_variable() noexcept = default; ``` Signed-off-by: Radosław Zarzyński --- diff --git a/ceph.spec.in b/ceph.spec.in index 649247308a79..a07782863776 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -186,7 +186,7 @@ BuildRequires: gperf BuildRequires: cmake > 3.5 BuildRequires: fuse-devel %if 0%{with seastar} && 0%{?rhel} -BuildRequires: gcc-toolset-9-gcc-c++ >= 9.2.1-2.3 +BuildRequires: gcc-toolset-10-gcc-c++ >= 10.3.1-1.2 %else BuildRequires: gcc-c++ %endif @@ -300,10 +300,10 @@ BuildRequires: libasan BuildRequires: libatomic %endif %if 0%{?rhel} -BuildRequires: gcc-toolset-9-annobin -BuildRequires: gcc-toolset-9-libubsan-devel -BuildRequires: gcc-toolset-9-libasan-devel -BuildRequires: gcc-toolset-9-libatomic-devel +BuildRequires: gcc-toolset-10-annobin +BuildRequires: gcc-toolset-10-libubsan-devel +BuildRequires: gcc-toolset-10-libasan-devel +BuildRequires: gcc-toolset-10-libatomic-devel %endif %endif ################################################################################# @@ -1235,7 +1235,7 @@ This package provides Ceph default alerts for Prometheus. %endif %if 0%{with seastar} && 0%{?rhel} -. /opt/rh/gcc-toolset-9/enable +. /opt/rh/gcc-toolset-10/enable %endif %if 0%{with cephfs_java}