parent
b58a9fb12e
commit
49441d4a2a
@ -0,0 +1,22 @@
|
|||||||
|
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);
|
@ -1,22 +0,0 @@
|
|||||||
From 9114d3957725acd34aa8b8d011585812f3369411 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jeroen Ooms <jeroenooms@gmail.com>
|
|
||||||
Date: Tue, 20 Oct 2015 13:10:38 +0200
|
|
||||||
Subject: [PATCH] enable static libraries on mingw
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.ac | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 393505b..e92131a 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -265,7 +265,7 @@ case "${host_os}" in
|
|
||||||
libzmq_dso_visibility="no"
|
|
||||||
|
|
||||||
if test "x$enable_static" = "xyes"; then
|
|
||||||
- AC_MSG_ERROR([Building static libraries is not supported under MinGW32])
|
|
||||||
+ CPPFLAGS="-DZMQ_STATIC"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set FD_SETSIZE to 1024
|
|
@ -1,22 +0,0 @@
|
|||||||
From 9e6745c12e0b100cd38acecc16ce7db02905e27c Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Millard <dmillard10@gmail.com>
|
|
||||||
Date: Tue, 10 May 2016 13:53:53 -0700
|
|
||||||
Subject: [PATCH] Fix autotools for static MinGW builds
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.ac | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 5a0fa14..def6ea7 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -259,7 +259,7 @@ case "${host_os}" in
|
|
||||||
libzmq_dso_visibility="no"
|
|
||||||
|
|
||||||
if test "x$enable_static" = "xyes"; then
|
|
||||||
- CPPFLAGS="-DZMQ_STATIC"
|
|
||||||
+ CPPFLAGS="-DZMQ_STATIC $CPPFLAGS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set FD_SETSIZE to 1024
|
|
@ -1,38 +0,0 @@
|
|||||||
From ffe62d3398d5e0191f554f61049aa7ec9fc892ae Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gregory Lemercier <greglemercier@free.fr>
|
|
||||||
Date: Sun, 7 Oct 2018 18:06:54 +0200
|
|
||||||
Subject: [PATCH] Fix build on arm64 architectures with some strict compilers
|
|
||||||
|
|
||||||
This patch fixes an issue that occurs on 64-bit architetures under
|
|
||||||
strict compiler rules. The code initially checked that the received
|
|
||||||
size stored in 'uint64_t' was not bigger than the max value of a
|
|
||||||
'size_t' variable, which is legitimate on 32-bit architectures where
|
|
||||||
'size_t' variables are stored on 32 bits. On 64-bit architectures,
|
|
||||||
this test no longer makes sense since 'uint64_t' and 'size_t' types
|
|
||||||
have the same size. The issue is fixed by ignoring this portion
|
|
||||||
of code when built for arm64.
|
|
||||||
---
|
|
||||||
src/v1_decoder.cpp | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/v1_decoder.cpp b/src/v1_decoder.cpp
|
|
||||||
index b002dc9d..2c8c97a7 100644
|
|
||||||
--- a/src/v1_decoder.cpp
|
|
||||||
+++ b/src/v1_decoder.cpp
|
|
||||||
@@ -114,11 +114,13 @@ int zmq::v1_decoder_t::eight_byte_size_ready ()
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifndef __aarch64__
|
|
||||||
// Message size must fit within range of size_t data type.
|
|
||||||
if (payload_length - 1 > std::numeric_limits <size_t>::max ()) {
|
|
||||||
errno = EMSGSIZE;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
const size_t msg_size = static_cast <size_t> (payload_length - 1);
|
|
||||||
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
Loading…
Reference in new issue