mirror of
https://github.com/monero-project/monero.git
synced 2024-12-23 03:59:33 +00:00
Merge pull request #9017
fe4a34e
depends: zeromq: update to 4.3.5 (tobtoht)
This commit is contained in:
commit
5dbe2d0407
2 changed files with 2 additions and 29 deletions
|
@ -1,9 +1,8 @@
|
||||||
package=zeromq
|
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)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
|
||||||
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
||||||
$(package)_sha256_hash=c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5
|
$(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
|
||||||
$(package)_patches=06aba27b04c5822cb88a69677382a0f053367143.patch
|
|
||||||
|
|
||||||
define $(package)_set_vars
|
define $(package)_set_vars
|
||||||
$(package)_config_opts=--without-documentation --disable-shared --without-libsodium --disable-curve
|
$(package)_config_opts=--without-documentation --disable-shared --without-libsodium --disable-curve
|
||||||
|
@ -12,10 +11,6 @@ define $(package)_set_vars
|
||||||
$(package)_cxxflags=-std=c++11
|
$(package)_cxxflags=-std=c++11
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_preprocess_cmds
|
|
||||||
patch -p1 < $($(package)_patch_dir)/06aba27b04c5822cb88a69677382a0f053367143.patch
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
|
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -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);
|
|
Loading…
Reference in a new issue