From cce7754eb809472015b1611a3b6a029d0b476837 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Tue, 5 May 2015 20:30:20 -0400 Subject: [PATCH] Depends: Add ZeroMQ package --- depends/packages/packages.mk | 2 ++ depends/packages/zeromq.mk | 26 ++++++++++++++++++++++++++ qa/pull-tester/rpc-tests.sh | 4 ++++ qa/pull-tester/tests-config.sh.in | 1 + 4 files changed, 33 insertions(+) create mode 100644 depends/packages/zeromq.mk diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index babc1598b..ee577e888 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -1,5 +1,7 @@ zcash_packages := libsnark libgmp libsodium packages := boost openssl $(zcash_packages) googletest googlemock +packages_darwin:=zeromq +packages_linux:=zeromq native_packages := native_ccache wallet_packages=bdb diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk new file mode 100644 index 000000000..24e8e5f1c --- /dev/null +++ b/depends/packages/zeromq.mk @@ -0,0 +1,26 @@ +package=zeromq +$(package)_version=4.0.4 +$(package)_download_path=http://download.zeromq.org +$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_sha256_hash=1ef71d46e94f33e27dd5a1661ed626cd39be4d2d6967792a275040e34457d399 + +define $(package)_set_vars + $(package)_config_opts=--without-documentation --disable-shared + $(package)_config_opts_linux=--with-pic +endef + +define $(package)_config_cmds + $($(package)_autoconf) +endef + +define $(package)_build_cmds + $(MAKE) -C src +endef + +define $(package)_stage_cmds + $(MAKE) -C src DESTDIR=$($(package)_staging_dir) install +endef + +define $(package)_postprocess_cmds + rm -rf bin share +endef diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh index 28e59d554..eb30517a0 100755 --- a/qa/pull-tester/rpc-tests.sh +++ b/qa/pull-tester/rpc-tests.sh @@ -57,6 +57,10 @@ testScriptsExt=( 'p2p-acceptblock.py' ); +if [ "x$ENABLE_ZMQ" = "x1" ]; then + testScripts=( ${testScripts[@]} 'zmq_test.py' ) +fi + extArg="-extended" passOn=${@#$extArg} diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in index 1c27b15e4..1cb9ee06b 100755 --- a/qa/pull-tester/tests-config.sh.in +++ b/qa/pull-tester/tests-config.sh.in @@ -10,6 +10,7 @@ EXEEXT="@EXEEXT@" @ENABLE_WALLET_TRUE@ENABLE_WALLET=1 @BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 +@ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 REAL_BITCOIND="$BUILDDIR/src/zcashd${EXEEXT}" REAL_BITCOINCLI="$BUILDDIR/src/zcash-cli${EXEEXT}"