From b7936149d785792fa543dbe25d65269ef96e3f3c Mon Sep 17 00:00:00 2001 From: laokz Date: Sun, 2 Jul 2023 16:12:53 +0800 Subject: [PATCH] fix riscv64 16-byte atomic build error --- ceph.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 6a97123..8f9b60d 100644 --- a/ceph.spec +++ b/ceph.spec @@ -125,7 +125,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 17 +Release: 18 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -410,6 +410,8 @@ BuildRequires: /usr/bin/pathfix.py %ifarch loongarch64 BuildRequires: boost-devel BuildRequires: boost-random +%endif +%ifarch loongarch64 riscv64 BuildRequires: libatomic %endif @@ -1220,6 +1222,9 @@ This package provides Ceph default alerts for Prometheus. %patch13 -R -p1 %patch8 -R -p1 %endif +%ifarch riscv64 +sed -i 's/__s390x__/__riscv/' cmake/modules/CheckCxxAtomic.cmake +%endif %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -2501,6 +2506,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Mon Jul 03 2023 laokz - 2:16.2.7-18 +- fix riscv64 16-byte atomic build error + * Thu Jun 1 2023 wangzengliang - 2:16.2.7-17 - fix error for uninstall cephadm -- Gitee