forked from dashpay/dash
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge bitcoin#11986: [depends] zeromq 4.2.3
13a399a depends: patch pthread_set_name_np out of zeromq (Cory Fields) 8f79226 depends: zeromq 4.2.3 (fanquake) Pull request description: This is a followup to bitcoin#9254 and bitcoin#11981. Zeromq 4.2.3 was released just after bitcoin#9254 was merged, and contains a years worth of improvements/bug fixes. See the release notes [here](https://github.com/zeromq/libzmq/releases/tag/v4.2.3). Todo: - [ ] Add zeromq-4.2.3.tar.gz to /depends-sources on bitcoincore.org - [ ] Verify gitian builds are still OK - [ ] Check: zeromq/libzmq#2787 Tree-SHA512: 85e06f47be3e1fdedcee50ce90e3391d69df2ea1c167472ffc3126d8970d418eb75141b970e422eb2fda9a8cad00e6ba5b36afa53565171a9ebaa152a9dc9b60
- Loading branch information
Showing
3 changed files
with
40 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
From 6e6b47d5ab381c3df3b30bb0b0a6cf210dfb1eba Mon Sep 17 00:00:00 2001 | ||
From: Cory Fields <cory-nospam-@coryfields.com> | ||
Date: Mon, 5 Mar 2018 14:22:05 -0500 | ||
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 4fc59c3e..c3fdfd46 100644 | ||
--- a/src/thread.cpp | ||
+++ b/src/thread.cpp | ||
@@ -220,7 +220,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) return; | ||
@@ -233,6 +233,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.11.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters