From 4068217579d691923f9353f60ba6fddb4754dd3c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 5 Dec 2017 22:47:23 +0800 Subject: [PATCH] ceph.spec: use devtoolset-6-gcc-c++ on aarch64 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 --- ceph.spec.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 30692330aca..fca85980f60 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -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 -- 2.39.5