]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph.spec: use devtoolset-6-gcc-c++ on aarch64
authorKefu Chai <kchai@redhat.com>
Tue, 5 Dec 2017 14:47:23 +0000 (22:47 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 5 Dec 2017 15:48:15 +0000 (23:48 +0800)
see https://github.com/sclorg/centos-release-scl
see https://buildlogs.centos.org/centos/7/sclo/aarch64/rh/

Fixes: http://tracker.ceph.com/issues/22301
Signed-off-by: Kefu Chai <kchai@redhat.com>
ceph.spec.in

index 30692330aca79a987ca6fbd3778c7d17382dc07e..fca85980f60447092641b7106aabf95619a5c5ac 100644 (file)
@@ -122,7 +122,12 @@ 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
+BuildRequires: devtoolset-6-gcc-c++
+%endif
 %else
 BuildRequires: gcc-c++
 %endif
@@ -789,8 +794,13 @@ python-rbd, python-rgw or python-cephfs instead.
 %build
 
 %if 0%{?rhel} == 7
+%ifarch x86_64
 . /opt/rh/devtoolset-7/enable
 %endif
+%ifarch aarch64
+. /opt/rh/devtoolset-6/enable
+%endif
+%endif
 
 %if 0%{with cephfs_java}
 # Find jni.h