diff options
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | contrib/depends/packages/cppzmq.mk | 15 | ||||
| -rw-r--r-- | utils/build_scripts/android32.Dockerfile | 8 | ||||
| -rw-r--r-- | utils/build_scripts/android64.Dockerfile | 8 |
4 files changed, 2 insertions, 36 deletions
@@ -197,7 +197,7 @@ Install all dependencies at once on macOS with the provided Brewfile: ``` brew update && brew bundle --file=contrib/brew/Brewfile ``` FreeBSD one liner for required to build dependencies -```pkg install git gmake cmake pkgconf boost-libs cppzmq libsodium``` +```pkg install git gmake cmake pkgconf boost-libs libzmq libsodium``` ### Cloning the repository @@ -230,9 +230,6 @@ invokes cmake commands as needed. this to be worthwhile, the machine should have one core and about 2GB of RAM available per thread. - *Note*: If cmake can not find zmq.hpp file on macOS, installing `zmq.hpp` from - https://github.com/zeromq/cppzmq to `/usr/local/include` should fix that error. - *Note*: The instructions above will compile the most stable release of the Monero software. If you would like to use and test the most recent software, use ```git checkout master```. The master branch may contain updates that are @@ -457,7 +454,7 @@ Monero is also available as a port or package as 'monero-cli`. ### On OpenBSD: -You will need to add a few packages to your system. `pkg_add cmake gmake zeromq cppzmq libiconv boost`. +You will need to add a few packages to your system. `pkg_add cmake gmake zeromq libiconv boost`. The `doxygen` and `graphviz` packages are optional and require the xbase set. Running the test suite also requires `py-requests` package. diff --git a/contrib/depends/packages/cppzmq.mk b/contrib/depends/packages/cppzmq.mk deleted file mode 100644 index 33178f445..000000000 --- a/contrib/depends/packages/cppzmq.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=cppzmq -$(package)_version=4.4.1 -$(package)_download_path=https://github.com/zeromq/cppzmq/archive/ -$(package)_file_name=v$($(package)_version).tar.gz -$(package)_sha256_hash=117fc1ca24d98dbe1a60c072cde13be863d429134907797f8e03f654ce679385 -$(package)_dependencies=zeromq - -define $(package)_stage_cmds - mkdir $($(package)_staging_prefix_dir)/include &&\ - cp zmq.hpp $($(package)_staging_prefix_dir)/include -endef - -define $(package)_postprocess_cmds - rm -rf bin share -endef diff --git a/utils/build_scripts/android32.Dockerfile b/utils/build_scripts/android32.Dockerfile index 4e4f40276..a2d0edbb3 100644 --- a/utils/build_scripts/android32.Dockerfile +++ b/utils/build_scripts/android32.Dockerfile @@ -113,14 +113,6 @@ RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} \ && make -j${NPROC} \ && make install -# zmq.hpp -ARG CPPZMQ_VERSION=v4.2.3 -ARG CPPZMQ_HASH=6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6 -RUN git clone https://github.com/zeromq/cppzmq.git -b ${CPPZMQ_VERSION} \ - && cd cppzmq \ - && test `git rev-parse HEAD` = ${CPPZMQ_HASH} || exit 1 \ - && cp *.hpp ${PREFIX}/include - # Sodium ARG SODIUM_VERSION=1.0.16 ARG SODIUM_HASH=675149b9b8b66ff44152553fb3ebf9858128363d diff --git a/utils/build_scripts/android64.Dockerfile b/utils/build_scripts/android64.Dockerfile index 90eeb4bae..eca2d4da1 100644 --- a/utils/build_scripts/android64.Dockerfile +++ b/utils/build_scripts/android64.Dockerfile @@ -113,14 +113,6 @@ RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} \ && make -j${NPROC} \ && make install -# zmq.hpp -ARG CPPZMQ_VERSION=v4.2.3 -ARG CPPZMQ_HASH=6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6 -RUN git clone https://github.com/zeromq/cppzmq.git -b ${CPPZMQ_VERSION} \ - && cd cppzmq \ - && test `git rev-parse HEAD` = ${CPPZMQ_HASH} || exit 1 \ - && cp *.hpp ${PREFIX}/include - # Sodium ARG SODIUM_VERSION=1.0.16 ARG SODIUM_HASH=675149b9b8b66ff44152553fb3ebf9858128363d |