Navigation Menu

Skip to content

Commit

Permalink
Add gmp dependency to docs and circleci
Browse files Browse the repository at this point in the history
  • Loading branch information
hanssv committed Nov 29, 2019
1 parent 095dcd8 commit 4135c5f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .circleci/config.yml
Expand Up @@ -82,7 +82,7 @@ references:
command: |
sudo apt-get update
sudo apt-get -qq -y install git curl \
autoconf build-essential ncurses-dev libssl-dev
autoconf build-essential ncurses-dev libssl-dev libgmp-dev
install_otp: &install_otp
run:
Expand Down Expand Up @@ -425,6 +425,7 @@ commands:
- run:
name: Build branch docker image
command: |
docker pull aeternity/builder
docker build -t ${DOCKERHUB_REPO:?}:${CIRCLE_BRANCH/\//_} .
- run:
name: Start branch docker image
Expand Down Expand Up @@ -888,7 +889,8 @@ jobs:
# libsodium headers cannot be found without explicit brew link
command: |
brew update
brew install libsodium erlang@20
brew install gmp libsodium erlang@20
brew link gmp
brew link libsodium
brew link --force erlang@20
- *save_macos_package_cache
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -14,7 +14,7 @@ FROM ubuntu:18.04
COPY --from=builder /app/_build/prod/rel/aeternity /home/aeternity/node

# OpenSSL is shared lib dependency
RUN apt-get -qq update && apt-get -qq -y install libssl1.0.0 curl libsodium23 \
RUN apt-get -qq update && apt-get -qq -y install libssl1.0.0 curl libsodium23 libgmp10 \
&& ldconfig \
&& rm -rf /var/lib/apt/lists/*

Expand Down
1 change: 1 addition & 0 deletions Makefile
Expand Up @@ -241,6 +241,7 @@ eunit-latest: eunit-$(LATEST_PROTOCOL)
all-tests: eunit-$(LATEST_PROTOCOL) ct-$(LATEST_PROTOCOL)

docker: dockerignore-check
@docker pull aeternity/builder
@docker build -t aeternity/aeternity:local .

dockerignore-check: | .gitignore .dockerignore
Expand Down
2 changes: 2 additions & 0 deletions default.nix
Expand Up @@ -19,6 +19,8 @@ in {
stable.automake
stable.autoconf
stable.which
## emcl's dependencies
stable.gmp
];
## required to start the node locally
shellHooks = ''
Expand Down
6 changes: 3 additions & 3 deletions docs/build.md
Expand Up @@ -17,7 +17,7 @@ Update package database, packages and install the common tools and libraries:
```bash
sudo apt-get -qq update \
&& sudo apt-get -y upgrade \
&& sudo apt-get -qq -y install git autoconf build-essential erlang libsodium-dev
&& sudo apt-get -qq -y install git autoconf build-essential erlang libsodium-dev libgmp-dev
```

### Ubuntu 16.04
Expand All @@ -27,7 +27,7 @@ Update package database, packages and install the common tools and libraries:
```bash
sudo apt-get -qq update \
&& sudo apt-get -y upgrade \
&& sudo apt-get -qq -y install git curl autoconf build-essential ncurses-dev libssl-dev
&& sudo apt-get -qq -y install git curl autoconf build-essential ncurses-dev libssl-dev libgmp-dev
```

As Ubuntu 16.04 ships with outdated erlang and libsodium versions, they have to be installed from source:
Expand Down Expand Up @@ -68,7 +68,7 @@ The easiest way to install package on MacOS is Homebrew, it can be installed by
Then install the build dependencies using the `brew` command:
```
brew update
brew install erlang@21 openssl libsodium autoconf
brew install erlang@21 openssl libsodium autoconf gmp
```

## Building
Expand Down

0 comments on commit 4135c5f

Please sign in to comment.