From 36759b53635236bf99d866783d6d06c5811e261a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 23 Oct 2020 10:46:52 +0800 Subject: [PATCH] ceph.spec.in: install gcc-toolset on RHEL only there is no need to use GTS for compiling crimson, as the GCC-10 shipped by fedora32 is good enough. Signed-off-by: Kefu Chai --- ceph.spec.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 7f0e9d520418..266f35eabe86 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -211,18 +211,18 @@ BuildRequires: protobuf-devel BuildRequires: ragel BuildRequires: systemtap-sdt-devel BuildRequires: yaml-cpp-devel -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if 0%{?fedora} BuildRequires: libubsan BuildRequires: libasan BuildRequires: libatomic -%if 0%{with seastar} +%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 %endif %endif -%endif ################################################################################# # distro-conditional dependencies ################################################################################# @@ -1087,7 +1087,7 @@ This package provides Ceph’s default alerts for Prometheus. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200 %define _lto_cflags %{nil} -%if 0%{with seastar} +%if 0%{with seastar} && 0%{?rhel} . /opt/rh/gcc-toolset-9/enable %endif -- 2.47.3