diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-09-30 11:35:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-09-30 11:35:50 +0200 |
| commit | df692600c677e7170b2597f398b17551747ce889 (patch) | |
| tree | f0152399524c2b38aa1c9e026be14c40a68584a1 /Makefile.am | |
| parent | bb83d23ad8162b1bd31aae53fab1c1dee4523838 (diff) | |
| parent | 463a1d5244337915de36db36de573eb8782bc430 (diff) | |
Merge #16927: depends: Refresh ZeroMQ 4.3.1 patch
463a1d5244337915de36db36de573eb8782bc430 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 463a1d5244337915de36db36de573eb8782bc430 - 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
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions