Merge #16927: depends: Refresh ZeroMQ 4.3.1 patch

463a1d5244 Refresh ZeroMQ 4.3.1 patch (Nathan Marley)

Pull request description:

  Currently in Alpine Linux (latest, 3.10) in the depends system, one of the ZeroMQ patches won't apply cleanly because the context around the patch has changed and Alpine's `patch` implementation can't handle the diff.

  Some patch implementations can't handle fuzz / too much divergence from the original code.

  This PR just tweaks the context code around the patch so that less-sophisticated patch implementations (such as on Alpine Linux) can apply the patch without errors.

  This partially fixes #16925

ACKs for top commit:
  fanquake:
    ACK 463a1d5244 - Tested building zeromq in depends inside an [Alpine container](https://github.com/fanquake/core-review/blob/master/docker/alpine.dockerfile) as well as on macOS.

Tree-SHA512: d6e3cb60835cdd090b9b864ca9cb33961687606bc9184fbbeb7a54ec23db4057b9317b65c5c276fb8c5492cb3cfcc4a7f3369f049551f4eb0915db971f2290ce
This commit is contained in:
Wladimir J. van der Laan 2019-09-30 11:35:45 +02:00
commit df692600c6
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D

View file

@ -12,7 +12,7 @@ diff --git a/src/thread.cpp b/src/thread.cpp
index a1086b0c..9943f354 100644 index a1086b0c..9943f354 100644
--- a/src/thread.cpp --- a/src/thread.cpp
+++ b/src/thread.cpp +++ b/src/thread.cpp
@@ -307,7 +307,7 @@ void zmq::thread_t::setThreadName (const char *name_) @@ -308,7 +308,7 @@ void zmq::thread_t::setThreadName (const char *name_)
*/ */
if (!name_) if (!name_)
return; return;
@ -21,9 +21,9 @@ index a1086b0c..9943f354 100644
#if defined(ZMQ_HAVE_PTHREAD_SETNAME_1) #if defined(ZMQ_HAVE_PTHREAD_SETNAME_1)
int rc = pthread_setname_np (name_); int rc = pthread_setname_np (name_);
if (rc) if (rc)
@@ -323,6 +323,8 @@ void zmq::thread_t::setThreadName (const char *name_) @@ -324,6 +324,8 @@ void zmq::thread_t::setThreadName (const char *name_)
#elif defined(ZMQ_HAVE_PTHREAD_SET_NAME) #elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
pthread_set_name_np (descriptor, name_); pthread_set_name_np (_descriptor, name_);
#endif #endif
+#endif +#endif
+ return; + return;