diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2015-05-05 20:30:20 -0400 |
|---|---|---|
| committer | João Barbosa <joao@bitreserve.org> | 2015-09-16 10:59:32 +0100 |
| commit | 1136879df8af2358efb706c5af886778fbd94989 (patch) | |
| tree | a4082a5dbd33bc7373055989902ada818172a038 | |
| parent | 5624e055b310284e8dfd68833eea7f7246316354 (diff) | |
| download | bitcoin-1136879df8af2358efb706c5af886778fbd94989.tar.xz | |
Depends: Add ZeroMQ package
| -rw-r--r-- | depends/packages/packages.mk | 2 | ||||
| -rw-r--r-- | depends/packages/zeromq.mk | 26 | ||||
| -rwxr-xr-x | qa/pull-tester/rpc-tests.sh | 4 | ||||
| -rwxr-xr-x | qa/pull-tester/tests-config.sh.in | 1 |
4 files changed, 33 insertions, 0 deletions
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index a0d377bb43..fc1e5f0b68 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -1,4 +1,6 @@ packages:=boost openssl libevent +packages_darwin:=zeromq +packages_linux:=zeromq native_packages := native_ccache native_comparisontool qt_native_packages = native_protobuf diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk new file mode 100644 index 0000000000..24e8e5f1c9 --- /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 514bdf5640..c6181c48ca 100755 --- a/qa/pull-tester/rpc-tests.sh +++ b/qa/pull-tester/rpc-tests.sh @@ -59,6 +59,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 10f4d33e47..e881a95110 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/bitcoind${EXEEXT}" REAL_BITCOINCLI="$BUILDDIR/src/bitcoin-cli${EXEEXT}" |