From: Kefu Chai <kchai@redhat.com>
Date: Wed, 3 Apr 2019 03:08:04 +0000 (+0800)
Subject: install-deps,rpm: enable devtoolset-8 on aarch64 also
X-Git-Tag: v14.2.8~20^2~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32651%2Fhead;p=ceph.git

install-deps,rpm: enable devtoolset-8 on aarch64 also

in 5ae3b06e, we left aarch64 with devtoolset-7, but aarch64 builders are
also suffering from http://tracker.ceph.com/issues/38892. so i installed
devtoolset-8 on all aarch64 builders manually from the rpm packages
downloaded from koji builder:

- https://cbs.centos.org/koji/buildinfo?buildID=24923
- https://cbs.centos.org/koji/buildinfo?buildID=24931

libasan5, libubsan1 are not installed.

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 1e409fe5c6b..e6ca6d29196 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -149,12 +149,8 @@ BuildRequires:	fuse-devel
 %if 0%{?rhel} == 7
 # devtoolset offers newer make and valgrind-devel, but the old ones are good
 # enough.
-%ifarch x86_64
 BuildRequires:	devtoolset-8-gcc-c++ >= 8.2.1
 %else
-BuildRequires:	devtoolset-7-gcc-c++ >= 7.3.1-5.13
-%endif
-%else
 BuildRequires:	gcc-c++
 %endif
 BuildRequires:	gdbm
diff --git a/install-deps.sh b/install-deps.sh
index 8f671db1450..d4848ec328b 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -350,7 +350,7 @@ else
 			    $SUDO yum -y install centos-release-scl-rh
 			    $SUDO yum-config-manager --disable centos-sclo-rh
 			    $SUDO yum-config-manager --enable centos-sclo-rh-testing
-			    dts_ver=7
+			    dts_ver=8
 			    ;;
 		    esac
                 elif test $ID = rhel -a $MAJOR_VERSION = 7 ; then