diff options
| author | MarcoFalke <[email protected]> | 2018-07-19 14:19:21 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2018-07-19 14:19:23 -0400 |
| commit | 8c36432791652cd5a67ead6299a9611cf8fb81fa (patch) | |
| tree | 1c112f470625f7518cab1e98e002a73f51c88008 /src/httpserver.h | |
| parent | Merge #13715: tests: fixes mininode's P2PConnection sending messages on closi... (diff) | |
| parent | depends: disable Werror for zmqlib release, causes ndk build to break (diff) | |
| download | discoin-8c36432791652cd5a67ead6299a9611cf8fb81fa.tar.xz discoin-8c36432791652cd5a67ead6299a9611cf8fb81fa.zip | |
Merge #13689: depends: disable Werror when building zmq
a4ba2388fe depends: disable Werror for zmqlib release, causes ndk build to break (Lawrence Nahum)
Pull request description:
This PR ~~backports this libzmq commit https://github.com/zeromq/libzmq/pull/3140/commits/58d13395ece1fa0dd9b0583d736af4ac342c1267 from this merged upstream PR (but unreleased as of today) https://github.com/zeromq/libzmq/pull/3140 as a patch to our zmq 4.2.3 version.~~ passes --disable-Werror when we build zmq.
For reference see https://github.com/bitcoin/bitcoin/issues/11844#issuecomment-398406988
~~This patch~~ A similar patch is already in use in abcore/bitcoin_ndk and needed to build bitcoind for android using NDK or some versions of clang 6+ during cross compilation.
This patch won't be necessary once zmqlib releases a 4.2.6+ version including the fix and bitcoin core updates to it but it may be good to [have](https://github.com/bitcoin/bitcoin/pull/13689#issuecomment-405644394)
~~It also reintroduces autogen.sh as it is necessary for the patch to work, otherwise you'll have aclocal issues (see https://travis-ci.org/greenaddress/bitcoin/jobs/404902106). autogen,sh was removed in master only https://github.com/bitcoin/bitcoin/pull/11986 as non-necessary but otherwise unreleased.~~
In the likely case https://github.com/bitcoin/bitcoin/pull/13578 is merged first I rebased the patch for the newer zmq version (4.2.5) in https://github.com/greenaddress/bitcoin/tree/zmq-upgrade-mruddy-patched and i can update the PR accordingly or close and open a new one.
Tree-SHA512: ba8780c84b4ac4ead5605c0305827431a85c1c8503b7ed255a552469b22bdb4ca018449282f738794f573f93caed95c14ede7caadb3a3f14989f57cb74501f00
Diffstat (limited to 'src/httpserver.h')
0 files changed, 0 insertions, 0 deletions