diff options
| author | tobtoht <tob@featherwallet.org> | 2023-10-10 00:08:44 +0200 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2023-10-10 00:08:44 +0200 |
| commit | fe4a34ebb27c163d2c0533437a7ccbd95c324106 (patch) | |
| tree | e26239824d31e1aff8db3be8f2d7d74be6b08005 | |
| parent | Merge pull request #8919 (diff) | |
| download | monero-fe4a34ebb27c163d2c0533437a7ccbd95c324106.tar.xz | |
depends: zeromq: update to 4.3.5
| -rw-r--r-- | contrib/depends/packages/zeromq.mk | 9 | ||||
| -rw-r--r-- | contrib/depends/patches/zeromq/06aba27b04c5822cb88a69677382a0f053367143.patch | 22 |
2 files changed, 2 insertions, 29 deletions
diff --git a/contrib/depends/packages/zeromq.mk b/contrib/depends/packages/zeromq.mk index 20f2d4bd9..669d06d83 100644 --- a/contrib/depends/packages/zeromq.mk +++ b/contrib/depends/packages/zeromq.mk @@ -1,9 +1,8 @@ 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=06aba27b04c5822cb88a69677382a0f053367143.patch +$(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 define $(package)_set_vars $(package)_config_opts=--without-documentation --disable-shared --without-libsodium --disable-curve @@ -12,10 +11,6 @@ define $(package)_set_vars $(package)_cxxflags=-std=c++11 endef -define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/06aba27b04c5822cb88a69677382a0f053367143.patch -endef - define $(package)_config_cmds $($(package)_autoconf) AR_FLAGS=$($(package)_arflags) endef diff --git a/contrib/depends/patches/zeromq/06aba27b04c5822cb88a69677382a0f053367143.patch b/contrib/depends/patches/zeromq/06aba27b04c5822cb88a69677382a0f053367143.patch deleted file mode 100644 index 53e18a452..000000000 --- a/contrib/depends/patches/zeromq/06aba27b04c5822cb88a69677382a0f053367143.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 06aba27b04c5822cb88a69677382a0f053367143 Mon Sep 17 00:00:00 2001 -From: sabotagebeats <27985126+sabotagebeats@users.noreply.github.com> -Date: Thu, 22 Jul 2021 21:53:19 -0700 -Subject: [PATCH] fix: building libzmq fails with error src/clock.cpp:131:16: - error: unused variable 'nsecs_per_usec' - ---- - src/clock.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/clock.cpp b/src/clock.cpp -index 93da90a8e..63c0100a5 100644 ---- a/src/clock.cpp -+++ b/src/clock.cpp -@@ -195,6 +195,7 @@ uint64_t zmq::clock_t::now_us () - - #else - -+ LIBZMQ_UNUSED (nsecs_per_usec); - // Use POSIX gettimeofday function to get precise time. - struct timeval tv; - int rc = gettimeofday (&tv, NULL); |