From: Kefu Chai <kchai@redhat.com>
Date: Fri, 23 Oct 2020 02:46:52 +0000 (+0800)
Subject: ceph.spec.in: install gcc-toolset on RHEL only
X-Git-Tag: v16.1.0~747^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37761%2Fhead;p=ceph.git

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 <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 7f0e9d52041..266f35eabe8 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