pool/zeromq
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- qemu-user.patch: upstreamed, removed

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zeromq?expand=0&rev=85
This commit is contained in:
Adam Majer 2023-10-24 09:23:49 +00:00 committed by Git OBS Bridge
parent 0697d1544b
commit ceae64d561
3 changed files with 2 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
qemu-user.patch
View File

@ -1,64 +0,0 @@
From 48960c229388980fafa4528f9e7511fca972ff3b Mon Sep 17 00:00:00 2001
From: Han Gao <gaohan@iscas.ac.cn>
Date: Tue, 10 Jan 2023 01:12:20 +0800
Subject: [PATCH] fix: fix build on qemu-user
In qemu-user, CACHELINE_SIZE probe is undefined
Signed-off-by: Han Gao <gaohan@iscas.ac.cn>
---
CMakeLists.txt | 3 ++-
RELICENSE/hangao.md | 13 +++++++++++++
acinclude.m4 | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 RELICENSE/hangao.md
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8672d617..072a6507 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -481,7 +481,8 @@ execute_process(
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
if(CACHELINE_SIZE STREQUAL ""
OR CACHELINE_SIZE EQUAL 0
- OR CACHELINE_SIZE EQUAL -1)
+ OR CACHELINE_SIZE EQUAL -1
+ OR CACHELINE_SIZE EQUAL "undefined")
set(ZMQ_CACHELINE_SIZE 64)
else()
set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE})
diff --git a/RELICENSE/hangao.md b/RELICENSE/hangao.md
new file mode 100644
index 00000000..de100bb5
--- /dev/null
+++ b/RELICENSE/hangao.md
@@ -0,0 +1,13 @@
+# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
+
+This is a statement by Han Gao that grants permission to relicense its copyrights in the libzmq C++
+library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
+Open Source Initiative approved license chosen by the current ZeroMQ
+BDFL (Benevolent Dictator for Life).
+
+A portion of the commits made by the Github handle "Rabenda", with
+commit author "Han Gao <gaohan@iscas.ac.cn>" or "Han Gao <rabenda.cn@gmail.com>", are copyright of Han Gao .
+This document hereby grants the libzmq project team to relicense libzmq,
+including all past, present and future contributions of the author listed above.
+
+Han Gao 2023/01/10
diff --git a/acinclude.m4 b/acinclude.m4
index ac55776e..f27fc8e8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1254,7 +1254,7 @@ AC_DEFUN([LIBZMQ_CHECK_CACHELINE], [{
AC_CHECK_TOOL(libzmq_getconf, getconf)
if ! test "x$libzmq_getconf" = "x"; then
zmq_cacheline_size=$($libzmq_getconf LEVEL1_DCACHE_LINESIZE 2>/dev/null || echo 64)
- if test "x$zmq_cacheline_size" = "x0" -o "x$zmq_cacheline_size" = "x-1"; then
+ if test "x$zmq_cacheline_size" = "x0" -o "x$zmq_cacheline_size" = "x-1" -o "x$zmq_cacheline_size" = "xundefined"; then
# getconf on some architectures does not know the size, try to fallback to
# the value the kernel knows on Linux
zmq_cacheline_size=$(cat /sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size 2>/dev/null || echo 64)
--
2.39.1

2
zeromq.changes
View File

@ -31,6 +31,8 @@ Tue Oct 24 09:13:45 UTC 2023 - Adam Majer <adam.majer@suse.de>
See doc/zmq_ppoll.txt for details.
* Various bug fixes and performance improvements.
- qemu-user.patch: upstreamed, removed
-------------------------------------------------------------------
Mon Jan 23 15:42:18 UTC 2023 - Andreas Schwab <schwab@suse.de>

2
zeromq.spec
View File

@ -31,7 +31,6 @@ Group: Productivity/Networking/Web/Servers
URL: http://www.zeromq.org/
Source: https://github.com/zeromq/libzmq/releases/download/v%{version}/zeromq-%{version}.tar.gz
Source99: baselibs.conf
Patch1: qemu-user.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@ -105,7 +104,6 @@ This package holds the development files for ZeroMQ.
%prep
%setup -q
%patch1 -p1
%build
autoreconf -fi