]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: always use stock compiler on el9
authorKefu Chai <tchaikov@gmail.com>
Wed, 10 Aug 2022 14:52:12 +0000 (22:52 +0800)
committerDavid Galloway <dgallowa@redhat.com>
Wed, 10 Aug 2022 20:46:46 +0000 (16:46 -0400)
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)

ceph.spec.in

index 0fd4271af45e9d020c0ca3358568b681c5ade850..471b6655d1516c254c3ca7076b29beb0347b474f 100644 (file)
 # 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