mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
45db031556
13a399a46depends: patch pthread_set_name_np out of zeromq (Cory Fields)8f7922636depends: zeromq 4.2.3 (fanquake) Pull request description: This is a followup to #9254 and #11981. Zeromq 4.2.3 was released just after #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: https://github.com/zeromq/libzmq/pull/2787 Tree-SHA512: 85e06f47be3e1fdedcee50ce90e3391d69df2ea1c167472ffc3126d8970d418eb75141b970e422eb2fda9a8cad00e6ba5b36afa53565171a9ebaa152a9dc9b60 (cherry picked from commit765a3ebb02) # Conflicts: # doc/dependencies.md
36 lines
891 B
Diff
36 lines
891 B
Diff
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
|
|
|