mirror of
https://github.com/ceph/ceph
synced 2025-02-22 02:27:29 +00:00
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 <kchai@redhat.com>
This commit is contained in:
parent
559c54f9c2
commit
4068217579
10
ceph.spec.in
10
ceph.spec.in
@ -122,7 +122,12 @@ BuildRequires: fuse-devel
|
|||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
# devtoolset offers newer make and valgrind-devel, but the old ones are good
|
# devtoolset offers newer make and valgrind-devel, but the old ones are good
|
||||||
# enough.
|
# enough.
|
||||||
|
%ifarch x86_64
|
||||||
BuildRequires: devtoolset-7-gcc-c++
|
BuildRequires: devtoolset-7-gcc-c++
|
||||||
|
%endif
|
||||||
|
%ifarch aarch64
|
||||||
|
BuildRequires: devtoolset-6-gcc-c++
|
||||||
|
%endif
|
||||||
%else
|
%else
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%endif
|
%endif
|
||||||
@ -789,8 +794,13 @@ python-rbd, python-rgw or python-cephfs instead.
|
|||||||
%build
|
%build
|
||||||
|
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
|
%ifarch x86_64
|
||||||
. /opt/rh/devtoolset-7/enable
|
. /opt/rh/devtoolset-7/enable
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch aarch64
|
||||||
|
. /opt/rh/devtoolset-6/enable
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{with cephfs_java}
|
%if 0%{with cephfs_java}
|
||||||
# Find jni.h
|
# Find jni.h
|
||||||
|
Loading…
Reference in New Issue
Block a user