Skip to content

Commit

Permalink
ceph.spec.in: use gcc-toolset when with seastar or rhel 8
Browse files Browse the repository at this point in the history
both RHEL8 and RHEL9 have gcc-toolset 13, and we need to use gts-13
for building crimson, so let's enable it when building crimson,
and we need to use gts-11 when building on RHEL7. hence this change.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
  • Loading branch information
tchaikov committed Mar 11, 2024
1 parent 55da694 commit 913d127
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions ceph.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,10 @@
%if 0%{with seastar}
%{!?gts_version: %global gts_version 13}
%else
%if 0%{?rhel} == 8
%{!?gts_version: %global gts_version 11}
%endif
%endif

# gcc-toolset-13 seems to trigger a linker bug resulting in a segfault in SafeTimer
# and perhaps elsewhere. For now, let's just disable it. See
Expand Down Expand Up @@ -190,7 +192,7 @@
# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but
# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler.
%undefine _annotated_build
%if 0%{?rhel} == 8
%if 0%{?gts_version} > 0
%if 0%{gts_version} == 13
%if 0%{?enable_devtoolset13:1}
%enable_devtoolset13
Expand Down Expand Up @@ -254,7 +256,7 @@ BuildRequires: gcc-c++ >= 11
%if 0%{?suse_version} == 1500
BuildRequires: gcc11-c++
%endif
%if 0%{?rhel} == 8
%if 0%{?gts_version} > 0
BuildRequires: gcc-toolset-%{gts_version}-gcc-c++
%if 0%{?gts_version} >= 12
BuildRequires: gcc-toolset-%{gts_version}-runtime
Expand Down Expand Up @@ -387,7 +389,7 @@ BuildRequires: libubsan
BuildRequires: libasan
BuildRequires: protobuf-devel
BuildRequires: protobuf-compiler
%if 0%{?rhel} == 8
%if 0%{?gts_version} > 0
%if 0%{?gts_version} >= 12
BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
%else
Expand Down

0 comments on commit 913d127

Please sign in to comment.