From: Kefu Chai <kchai@redhat.com>
Date: Fri, 22 Dec 2017 05:05:02 +0000 (+0800)
Subject: ceph.spec.in: use DTS-7 on aarch64 also
X-Git-Tag: wip-pdonnell-testing-20180317.202121~711^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=85a1fa68ab822c00c531c18deccb182fb81b2934;p=ceph-ci.git

ceph.spec.in: use DTS-7 on aarch64 also

see https://bugs.centos.org/view.php?id=14078

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index edac753b410..70ab1799eac 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -122,16 +122,7 @@ 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-7-gcc-c++
-%endif
-%ifarch aarch64
-%if 0%{?centos}
-BuildRequires:	devtoolset-6-gcc-c++
-%else
 BuildRequires:	devtoolset-7-gcc-c++
-%endif
-%endif
 %else
 BuildRequires:	gcc-c++
 %endif
@@ -798,17 +789,8 @@ python-rbd, python-rgw or python-cephfs instead.
 %build
 
 %if 0%{?rhel} == 7
-%ifarch x86_64
-. /opt/rh/devtoolset-7/enable
-%endif
-%ifarch aarch64
-%if 0%{?centos}
-. /opt/rh/devtoolset-6/enable
-%else
 . /opt/rh/devtoolset-7/enable
 %endif
-%endif
-%endif
 
 %if 0%{with cephfs_java}
 # Find jni.h