mirror of
https://github.com/ceph/ceph
synced 2025-03-06 08:20:12 +00:00
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>
This commit is contained in:
parent
d38a9370b6
commit
85a1fa68ab
18
ceph.spec.in
18
ceph.spec.in
@ -122,16 +122,7 @@ 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
|
|
||||||
%if 0%{?centos}
|
|
||||||
BuildRequires: devtoolset-6-gcc-c++
|
|
||||||
%else
|
|
||||||
BuildRequires: devtoolset-7-gcc-c++
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
%else
|
%else
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%endif
|
%endif
|
||||||
@ -798,17 +789,8 @@ 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
|
|
||||||
%if 0%{?centos}
|
|
||||||
. /opt/rh/devtoolset-6/enable
|
|
||||||
%else
|
|
||||||
. /opt/rh/devtoolset-7/enable
|
|
||||||
%endif
|
|
||||||
%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