Skip to content

Commit 8c36432

Browse files
author
MarcoFalke
committed
Merge #13689: depends: disable Werror when building zmq
a4ba238 depends: disable Werror for zmqlib release, causes ndk build to break (Lawrence Nahum) Pull request description: This PR ~~backports this libzmq commit zeromq/libzmq@58d1339 from this merged upstream PR (but unreleased as of today) zeromq/libzmq#3140 as a patch to our zmq 4.2.3 version.~~ passes --disable-Werror when we build zmq. For reference see bitcoin/bitcoin#11844 (comment) ~~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](bitcoin/bitcoin#13689 (comment)) ~~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 bitcoin/bitcoin#11986 as non-necessary but otherwise unreleased.~~ In the likely case bitcoin/bitcoin#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
2 parents e1260a7 + a4ba238 commit 8c36432

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

depends/packages/zeromq.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $(package)_sha256_hash=8f1e2b2aade4dbfde98d82366d61baef2f62e812530160d2e6d0a5bb2
66
$(package)_patches=0001-fix-build-with-older-mingw64.patch 0002-disable-pthread_set_name_np.patch
77

88
define $(package)_set_vars
9-
$(package)_config_opts=--without-docs --disable-shared --without-libsodium --disable-curve --disable-curve-keygen --disable-perf
9+
$(package)_config_opts=--without-docs --disable-shared --without-libsodium --disable-curve --disable-curve-keygen --disable-perf --disable-Werror
1010
$(package)_config_opts_linux=--with-pic
1111
$(package)_cxxflags=-std=c++11
1212
endef

0 commit comments

Comments
 (0)