mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
Merge bitcoin/bitcoin#28627: depends: zeromq 4.3.5
986d7fed057b995a720787cbbd21e1c41763fb83 depends: zeromq 4.3.5 (fanquake) Pull request description: First new point release of zeromq in two and a half years. Mostly bug fixes; the project also completed a relicense to the "Mozilla Public License". See https://github.com/zeromq/libzmq/releases/tag/v4.3.5. ACKs for top commit: hebasto: ACK 986d7fed057b995a720787cbbd21e1c41763fb83, I have reviewed the code and it looks OK. TheCharlatan: ACK 986d7fed057b995a720787cbbd21e1c41763fb83 Tree-SHA512: cdd6abfbbe10873c1ca267fed648c2e6ff17a4aff50c414924006e63fa39d501e803f8893a5cd966a2078b5c077f2578e482483e6723ea6f5760f16211d40998
This commit is contained in:
parent
0e6cb989a7
commit
4b704a60ad
@ -1,9 +1,9 @@
|
||||
package=zeromq
|
||||
$(package)_version=4.3.4
|
||||
$(package)_version=4.3.5
|
||||
$(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
|
||||
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
||||
$(package)_sha256_hash=c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5
|
||||
$(package)_patches=remove_libstd_link.patch netbsd_kevent_void.patch
|
||||
$(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
|
||||
$(package)_patches=remove_libstd_link.patch
|
||||
|
||||
define $(package)_set_vars
|
||||
$(package)_config_opts = --without-docs --disable-shared --disable-valgrind
|
||||
@ -15,8 +15,7 @@ define $(package)_set_vars
|
||||
endef
|
||||
|
||||
define $(package)_preprocess_cmds
|
||||
patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \
|
||||
patch -p1 < $($(package)_patch_dir)/netbsd_kevent_void.patch
|
||||
patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch
|
||||
endef
|
||||
|
||||
define $(package)_config_cmds
|
||||
|
@ -1,57 +0,0 @@
|
||||
commit 129137d5182967dbfcfec66bad843df2a992a78f
|
||||
Author: fanquake <fanquake@gmail.com>
|
||||
Date: Mon Jan 3 20:13:33 2022 +0800
|
||||
|
||||
problem: kevent udata is now void* on NetBSD Current (10)
|
||||
|
||||
solution: check for the intptr_t variant in configure.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1a571291..402f8b86 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -307,6 +307,27 @@ case "${host_os}" in
|
||||
if test "x$libzmq_netbsd_has_atomic" = "xno"; then
|
||||
AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes])
|
||||
fi
|
||||
+ # NetBSD Current (to become 10) has changed the type of udata in it's
|
||||
+ # kevent struct from intptr_t to void * to align with darwin and other
|
||||
+ # BSDs, see upstream commit:
|
||||
+ # https://github.com/NetBSD/src/commit/e5ead823eb916b56589d2c6c560dbcfe4a2d0afc
|
||||
+ AC_MSG_CHECKING([whether kevent udata type is intptr_t])
|
||||
+ AC_LANG_PUSH([C++])
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM(
|
||||
+ [[#include <sys/types.h>
|
||||
+ #include <sys/event.h>
|
||||
+ #include <sys/time.h>]],
|
||||
+ [[struct kevent ev;
|
||||
+ intptr_t udata;
|
||||
+ EV_SET(&ev, 0, 0, EV_ADD, 0, 0, udata);
|
||||
+ return 0;]])],
|
||||
+ [libzmq_netbsd_kevent_udata_intptr_t=yes],
|
||||
+ [libzmq_netbsd_kevent_udata_intptr_t=no])
|
||||
+ AC_LANG_POP([C++])
|
||||
+ AC_MSG_RESULT([$libzmq_netbsd_kevent_udata_intptr_t])
|
||||
+ if test "x$libzmq_netbsd_kevent_udata_intptr_t" = "xyes"; then
|
||||
+ AC_DEFINE(ZMQ_NETBSD_KEVENT_UDATA_INTPTR_T, 1, [kevent udata type is intptr_t])
|
||||
+ fi
|
||||
;;
|
||||
*openbsd*|*bitrig*)
|
||||
# Define on OpenBSD to enable all library features
|
||||
diff --git a/src/kqueue.cpp b/src/kqueue.cpp
|
||||
index 53d82ac4..a6a7a7f2 100644
|
||||
--- a/src/kqueue.cpp
|
||||
+++ b/src/kqueue.cpp
|
||||
@@ -46,9 +46,9 @@
|
||||
#include "i_poll_events.hpp"
|
||||
#include "likely.hpp"
|
||||
|
||||
-// NetBSD defines (struct kevent).udata as intptr_t, everyone else
|
||||
-// as void *.
|
||||
-#if defined ZMQ_HAVE_NETBSD
|
||||
+// NetBSD up to version 9 defines (struct kevent).udata as intptr_t,
|
||||
+// everyone else as void *.
|
||||
+#if defined ZMQ_HAVE_NETBSD && defined(ZMQ_NETBSD_KEVENT_UDATA_INTPTR_T)
|
||||
#define kevent_udata_t intptr_t
|
||||
#else
|
||||
#define kevent_udata_t void *
|
Loading…
Reference in New Issue
Block a user