From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 10 Aug 2022 14:52:12 +0000 (+0800)
Subject: ceph.spec.in: always use stock compiler on el9
X-Git-Tag: v17.2.4~113^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16f710208226b641f1ccda83ddfad52071e40cc9;p=ceph.git

ceph.spec.in: always use stock compiler on el9

as RHEL/CentOS 9, we have the access to GCC-11, which is good enough for
compiling main HEAD even with WITH_SEASTAR=ON.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 215c07ba8b21481e1951dfbfb2d52fbc0e58eecc)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 0fd4271af45e..471b6655d151 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -154,7 +154,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 && 0%{?enable_devtoolset11:1}
+%if 0%{?rhel} == 8 && 0%{?enable_devtoolset11:1}
 %enable_devtoolset11
 %endif
 
@@ -202,17 +202,17 @@ BuildRequires:	selinux-policy-devel
 BuildRequires:	gperf
 BuildRequires:  cmake > 3.5
 BuildRequires:	fuse-devel
-%if 0%{?fedora} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 9
 BuildRequires:	gcc-c++ >= 11
 %endif
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} == 8
 BuildRequires:	%{gts_prefix}-gcc-c++
 BuildRequires:	%{gts_prefix}-build
 %ifarch aarch64
 BuildRequires:	%{gts_prefix}-libatomic-devel
 %endif
 %endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} == 9
 BuildRequires:  libatomic
 %endif
 %if 0%{with tcmalloc}
@@ -328,7 +328,7 @@ BuildRequires:  systemtap-sdt-devel
 BuildRequires:  libubsan
 BuildRequires:  libasan
 %endif
-%if 0%{?rhel}
+%if 0%{?rhel} == 8
 BuildRequires:  %{gts_prefix}-annobin
 BuildRequires:  %{gts_prefix}-annobin-plugin-gcc
 BuildRequires:  %{gts_prefix}-libubsan-devel