Merge #18405: build: Drop all of the ZeroMQ patches
pull/764/headf642b49af7
build: Drop ZeroMQ patch for glibc < 2.12 (Hennadii Stepanov)079df9609e
build: Drop ZeroMQ patch for Mingw-w64 < 4.0 (Hennadii Stepanov) Pull request description: This PR gets rid of the all patches for ZeroMQ: - the [Mingw-w64 5.0 (Ubuntu 18.04 bionic)](https://packages.ubuntu.com/bionic/mingw-w64) is used to build the [Windows](https://github.com/bitcoin/bitcoin/blob/master/doc/build-windows.md) binaries - it is safe to use `pthread_setname_np` since #17538 when the minimal `glibc` version is set to 2.17; see: https://github.com/bitcoin/bitcoin/pull/11986#issuecomment-366105050 ACKs for top commit: fanquake: ACKf642b49af7
. Tree-SHA512: a2c97cdb682cd7d96a666ad099f20725a32bf8fda0842fc5534ca08a1634c90ba80afde92f9054595ed2501fbc5c02abbe3da765934ecff12d836ff25e277fc5
commit
c6b730dbfc
@ -1,30 +0,0 @@
|
||||
From f6866b0f166ad168618aae64c7fbee8775d3eb23 Mon Sep 17 00:00:00 2001
|
||||
From: mruddy <6440430+mruddy@users.noreply.github.com>
|
||||
Date: Sat, 30 Jun 2018 09:44:58 -0400
|
||||
Subject: [PATCH] fix build with older mingw64
|
||||
|
||||
---
|
||||
src/windows.hpp | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/src/windows.hpp b/src/windows.hpp
|
||||
index 6c3839fd..2c32ec79 100644
|
||||
--- a/src/windows.hpp
|
||||
+++ b/src/windows.hpp
|
||||
@@ -58,6 +58,13 @@
|
||||
#include <winsock2.h>
|
||||
#include <windows.h>
|
||||
#include <mswsock.h>
|
||||
+
|
||||
+#if defined __MINGW64_VERSION_MAJOR && __MINGW64_VERSION_MAJOR < 4
|
||||
+// Workaround for mingw-w64 < v4.0 which did not include ws2ipdef.h in iphlpapi.h.
|
||||
+// Fixed in mingw-w64 by 9bd8fe9148924840d315b4c915dd099955ea89d1.
|
||||
+#include <ws2def.h>
|
||||
+#include <ws2ipdef.h>
|
||||
+#endif
|
||||
#include <iphlpapi.h>
|
||||
|
||||
#if !defined __MINGW32__
|
||||
--
|
||||
2.17.1
|
||||
|
@ -1,35 +0,0 @@
|
||||
From c9bbdd6581d07acfe8971e4bcebe278a3676cf03 Mon Sep 17 00:00:00 2001
|
||||
From: mruddy <6440430+mruddy@users.noreply.github.com>
|
||||
Date: Sat, 30 Jun 2018 09:57:18 -0400
|
||||
Subject: [PATCH] disable pthread_set_name_np
|
||||
|
||||
pthread_set_name_np adds a Glibc requirement on >= 2.12.
|
||||
---
|
||||
src/thread.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/thread.cpp b/src/thread.cpp
|
||||
index a1086b0c..9943f354 100644
|
||||
--- a/src/thread.cpp
|
||||
+++ b/src/thread.cpp
|
||||
@@ -308,7 +308,7 @@ void zmq::thread_t::setThreadName (const char *name_)
|
||||
*/
|
||||
if (!name_)
|
||||
return;
|
||||
-
|
||||
+#if 0
|
||||
#if defined(ZMQ_HAVE_PTHREAD_SETNAME_1)
|
||||
int rc = pthread_setname_np (name_);
|
||||
if (rc)
|
||||
@@ -324,6 +324,8 @@ void zmq::thread_t::setThreadName (const char *name_)
|
||||
#elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
|
||||
pthread_set_name_np (_descriptor, name_);
|
||||
#endif
|
||||
+#endif
|
||||
+ return;
|
||||
}
|
||||
|
||||
#endif
|
||||
--
|
||||
2.17.1
|
||||
|
Loading…
Reference in new issue