From a7a6682bde263e1f53989760162d1ac0ce86e5c9 Mon Sep 17 00:00:00 2001 From: zhangxiang-plct Date: Tue, 6 Jun 2023 14:10:56 +0800 Subject: [PATCH] fix clang build error fix clang build error --- fix-clang.patch | 12 ++++++++++++ zeromq.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 fix-clang.patch diff --git a/fix-clang.patch b/fix-clang.patch new file mode 100644 index 0000000..390c07e --- /dev/null +++ b/fix-clang.patch @@ -0,0 +1,12 @@ +diff -ur libzmq-4.3.4/src/yqueue.hpp libzmq-4.3.4/src/yqueue.hpp +--- libzmq-4.3.4/src/yqueue.hpp 2021-01-17 12:01:58.000000000 +0000 ++++ libzmq-4.3.4/src/yqueue.hpp 2023-06-05 07:02:47.152187525 +0000 +@@ -35,7 +35,7 @@ + + #include "err.hpp" + #include "atomic_ptr.hpp" +- ++const int ZMQ_CACHELINE_SIZE=64; + namespace zmq + { + // yqueue is an efficient queue implementation. The main goal is diff --git a/zeromq.spec b/zeromq.spec index 4ba1b8a..5a9e818 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -1,6 +1,6 @@ Name: zeromq Version: 4.3.4 -Release: 3 +Release: 4 Summary: Software library for fast, message-based applications License: LGPLv3+ @@ -8,6 +8,9 @@ URL: https://zeromq.org Source0: https://github.com/%{name}/libzmq/archive/v%{version}/libzmq-%{version}.tar.gz Patch0000: fix-test_inproc_connect-occasionally-fails-on-slow-archs.patch +%ifarch riscv64 +Patch0001: fix-clang.patch +%endif BuildRequires: make BuildRequires: autoconf @@ -95,6 +98,9 @@ make check %{?_smp_mflags} || make check || make check || make check || ( cat te %{_mandir}/man7/zmq.* %changelog +* Tue Jun 6 2023 zhangxiang - 4.3.4-4 +- Fix clang build error + * Tue AUg 23 2022 yaoxin - 4.3.4-3 - Fix build error -- Gitee