4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 11:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cppzmq: remove leftovers

Browse Source
This commit is contained in:
selsta 2020-03-06 02:30:07 +01:00
parent 4764d18eeb
commit b40c27cd42
No known key found for this signature in database
GPG Key ID: 2EA0A99A8B07AE5E
4 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -197,7 +197,7 @@ Install all dependencies at once on macOS with the provided Brewfile:
``` brew update && brew bundle --file=contrib/brew/Brewfile ``` ``` brew update && brew bundle --file=contrib/brew/Brewfile ```
FreeBSD one liner for required to build dependencies 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 ### 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 this to be worthwhile, the machine should have one core and about 2GB of RAM
available per thread. 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 *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, 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 use ```git checkout master```. The master branch may contain updates that are
@ -456,7 +453,7 @@ We expect to add Monero into the ports tree in the near future, which will aid i
### On OpenBSD: ### 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. The `doxygen` and `graphviz` packages are optional and require the xbase set.
Running the test suite also requires `py-requests` package. Running the test suite also requires `py-requests` package.

15
contrib/depends/packages/cppzmq.mk
View File

@ -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

8
utils/build_scripts/android32.Dockerfile
View File

@ -113,14 +113,6 @@ RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} \
&& make -j${NPROC} \ && make -j${NPROC} \
&& make install && 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 # Sodium
ARG SODIUM_VERSION=1.0.16 ARG SODIUM_VERSION=1.0.16
ARG SODIUM_HASH=675149b9b8b66ff44152553fb3ebf9858128363d ARG SODIUM_HASH=675149b9b8b66ff44152553fb3ebf9858128363d

8
utils/build_scripts/android64.Dockerfile
View File

@ -113,14 +113,6 @@ RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} \
&& make -j${NPROC} \ && make -j${NPROC} \
&& make install && 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 # Sodium
ARG SODIUM_VERSION=1.0.16 ARG SODIUM_VERSION=1.0.16
ARG SODIUM_HASH=675149b9b8b66ff44152553fb3ebf9858128363d ARG SODIUM_HASH=675149b9b8b66ff44152553fb3ebf9858128363d