From 5c6ca4c2915a2593aa86c0466881b857545d0c05 Mon Sep 17 00:00:00 2001 From: ca333 Date: Sun, 17 Feb 2019 15:15:17 +0100 Subject: [PATCH 1/5] update ZMQ --- depends/packages/zeromq.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index ab3b95632..57806f50e 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -1,9 +1,9 @@ ifeq ($(host_os),mingw32) -$(package)_version=4.2.2-1 +$(package)_version=4.3.1 $(package)_download_path=https://github.com/ca333/libzmq/archive $(package)_download_file=v$($(package)_version).tar.gz $(package)_file_name=libzmq-$($(package)_version).tar.gz -$(package)_sha256_hash=0e225b85ce11be23bf7eb7d3f25c6686728bf30d5c31f61c12d37bb646c69962 +$(package)_sha256_hash=cb8ebe5b60dadeb526745610d6237f05a98aba287114d8991dad1fa14f4be354 define $(package)_set_vars $(package)_build_env+= From 4f5ba23dfcf01bd3d272da05a004b60af3a8b40e Mon Sep 17 00:00:00 2001 From: ca333 Date: Sun, 17 Feb 2019 16:05:19 +0100 Subject: [PATCH 2/5] set static ZMQ flag --- depends/packages/zeromq.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 57806f50e..b7b352f12 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -9,7 +9,7 @@ define $(package)_set_vars $(package)_build_env+= $(package)_config_opts=--enable-shared=false --enable-static --host=x86_64-w64-mingw32 $(package)_config_opts_mingw32=--enable-shared=false --enable-static --host=x86_64-w64-mingw32 - $(package)_cflags=-Wno-error -Wall -Wno-pedantic-ms-format -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lws2_32 -liphlpapi -lrpcrt4 + $(package)_cflags=-Wno-error -Wall -Wno-pedantic-ms-format -DZMQ_STATIC -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lws2_32 -liphlpapi -lrpcrt4 $(package)_conf_tool=./configure endef else @@ -31,7 +31,8 @@ define $(package)_preprocess_cmds cd $($(package)_build_subdir); ./autogen.sh endef define $(package)_config_cmds - $($(package)_conf_tool) $($(package)_config_opts) CFLAGS="-Wno-error -Wall -Wno-pedantic-ms-format -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lws2_32 -liphlpapi -lrpcrt4" + $($(package)_conf_tool) $($(package)_config_opts) + CFLAGS="-Wno-error -Wall -Wno-pedantic-ms-format -DZMQ_STATIC -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lzmq -lws2_32 -liphlpapi -lrpcrt4" endef else define $(package)_config_cmds From ec95ae2d65c11e821f8f41878d48ea249e9b02d4 Mon Sep 17 00:00:00 2001 From: ca333 Date: Sun, 17 Feb 2019 17:14:18 +0100 Subject: [PATCH 3/5] remove ZMQ from WIN --- depends/packages/packages.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 5bc8fcda6..624079b91 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -49,6 +49,6 @@ wallet_packages=bdb ifeq ($(host_os),linux) packages := boost openssl libevent zeromq $(zcash_packages) googletest #googlemock else - packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest #googlemock + packages := boost openssl libevent $(zcash_packages) libcurl googletest #googlemock endif From af9ff2e6204f6432fca42010fc564b4dc7b43c32 Mon Sep 17 00:00:00 2001 From: ca333 Date: Sun, 17 Feb 2019 18:20:57 +0100 Subject: [PATCH 4/5] update zeromq --- depends/packages/zeromq.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index b7b352f12..89fb6ef1c 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -8,8 +8,8 @@ $(package)_sha256_hash=cb8ebe5b60dadeb526745610d6237f05a98aba287114d8991dad1fa14 define $(package)_set_vars $(package)_build_env+= $(package)_config_opts=--enable-shared=false --enable-static --host=x86_64-w64-mingw32 - $(package)_config_opts_mingw32=--enable-shared=false --enable-static --host=x86_64-w64-mingw32 - $(package)_cflags=-Wno-error -Wall -Wno-pedantic-ms-format -DZMQ_STATIC -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lws2_32 -liphlpapi -lrpcrt4 + $(package)_config_opts_mingw32=--enable-shared=false --enable-static --prefix=$(host_prefix) --host=x86_64-w64-mingw32 -disable-curve + $(package)_cflags=-Wno-error -Wall -Wno-pedantic-ms-format -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lws2_32 -liphlpapi -lrpcrt4 $(package)_conf_tool=./configure endef else @@ -31,8 +31,7 @@ define $(package)_preprocess_cmds cd $($(package)_build_subdir); ./autogen.sh endef define $(package)_config_cmds - $($(package)_conf_tool) $($(package)_config_opts) - CFLAGS="-Wno-error -Wall -Wno-pedantic-ms-format -DZMQ_STATIC -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lzmq -lws2_32 -liphlpapi -lrpcrt4" + $($(package)_conf_tool) $($(package)_config_opts) CFLAGS="-Wno-error -Wall -Wno-pedantic-ms-format -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lws2_32 -liphlpapi -lrpcrt4" endef else define $(package)_config_cmds From 7d50f06c7613cf74f56d23768919c7f52b114922 Mon Sep 17 00:00:00 2001 From: ca333 Date: Sun, 17 Feb 2019 18:21:18 +0100 Subject: [PATCH 5/5] add ZMQ to WIN --- depends/packages/packages.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 624079b91..5bc8fcda6 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -49,6 +49,6 @@ wallet_packages=bdb ifeq ($(host_os),linux) packages := boost openssl libevent zeromq $(zcash_packages) googletest #googlemock else - packages := boost openssl libevent $(zcash_packages) libcurl googletest #googlemock + packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest #googlemock endif