Skip to content

Commit df69260

Browse files
committed
Merge #16927: depends: Refresh ZeroMQ 4.3.1 patch
463a1d5 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 463a1d5 - 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
2 parents bb83d23 + 463a1d5 commit df69260

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

depends/patches/zeromq/0002-disable-pthread_set_name_np.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ diff --git a/src/thread.cpp b/src/thread.cpp
1212
index a1086b0c..9943f354 100644
1313
--- a/src/thread.cpp
1414
+++ b/src/thread.cpp
15-
@@ -307,7 +307,7 @@ void zmq::thread_t::setThreadName (const char *name_)
15+
@@ -308,7 +308,7 @@ void zmq::thread_t::setThreadName (const char *name_)
1616
*/
1717
if (!name_)
1818
return;
@@ -21,9 +21,9 @@ index a1086b0c..9943f354 100644
2121
#if defined(ZMQ_HAVE_PTHREAD_SETNAME_1)
2222
int rc = pthread_setname_np (name_);
2323
if (rc)
24-
@@ -323,6 +323,8 @@ void zmq::thread_t::setThreadName (const char *name_)
24+
@@ -324,6 +324,8 @@ void zmq::thread_t::setThreadName (const char *name_)
2525
#elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
26-
pthread_set_name_np (descriptor, name_);
26+
pthread_set_name_np (_descriptor, name_);
2727
#endif
2828
+#endif
2929
+ return;

0 commit comments

Comments
 (0)