From: Kefu Chai <kchai@redhat.com>
Date: Tue, 26 Mar 2019 07:19:58 +0000 (+0800)
Subject: rpm: s/devtoolset-7/devtoolset-8/
X-Git-Tag: v14.2.5~59^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c82fbc24c48df7668cdaa2330bc1d7517fa84518;p=ceph.git

rpm: s/devtoolset-7/devtoolset-8/

should activate devtoolset-8 not devtoolset-7 for enabling GCC-8.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 9694a72daedbd8736893ac87399b7572fceebc6b)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 0445395ea1d..8e8cfba331a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1087,7 +1087,7 @@ This package provides Ceph’s default alerts for Prometheus.
 %define _lto_cflags %{nil}
 
 %if 0%{?rhel} == 7
-. /opt/rh/devtoolset-7/enable
+. /opt/rh/devtoolset-8/enable
 %endif
 
 %if 0%{with cephfs_java}