Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package zeromq for openSUSE:Factory checked in at 2023-01-25 17:42:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zeromq (Old) and /work/SRC/openSUSE:Factory/.zeromq.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zeromq" Wed Jan 25 17:42:28 2023 rev:42 rq:1060587 version:4.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/zeromq/zeromq.changes 2022-08-17 18:31:45.360413586 +0200 +++ /work/SRC/openSUSE:Factory/.zeromq.new.32243/zeromq.changes 2023-01-25 17:42:41.767894931 +0100 @@ -1,0 +2,5 @@ +Mon Jan 23 15:42:18 UTC 2023 - Andreas Schwab <sch...@suse.de> + +- qemu-user.patch: Fix build with qemu linux-user emulation + +------------------------------------------------------------------- New: ---- qemu-user.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zeromq.spec ++++++ --- /var/tmp/diff_new_pack.QxzOwD/_old 2023-01-25 17:42:42.539899132 +0100 +++ /var/tmp/diff_new_pack.QxzOwD/_new 2023-01-25 17:42:42.543899154 +0100 @@ -1,7 +1,7 @@ # # spec file for package zeromq # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,11 @@ 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++ +BuildRequires: libtool BuildRequires: libunwind-devel BuildRequires: pkgconfig %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -101,8 +105,10 @@ %prep %setup -q +%patch1 -p1 %build +autoreconf -fi export LIBS=-ldl %configure \ --with-libsodium \ ++++++ qemu-user.patch ++++++ >From 48960c229388980fafa4528f9e7511fca972ff3b Mon Sep 17 00:00:00 2001 From: Han Gao <gao...@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 <gao...@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 <gao...@iscas.ac.cn>" or "Han Gao <rabenda...@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
