diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-03-01 12:07:59 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-03-01 12:08:04 +0100 |
| commit | ad89812c70a9b88be642fceffb970859f6fdcba2 (patch) | |
| tree | cb7aa122fe73abe00bc19604370182569c7b3358 | |
| parent | 362e901a17cce80cb6af97d4c69dce3f1e7c695b (diff) | |
| parent | 97f10621f4b76fbfcc0849b10d5edb4d6898ec5e (diff) | |
| download | bitcoin-ad89812c70a9b88be642fceffb970859f6fdcba2.tar.xz | |
Merge #21321: guix: Add curl to required tool list
97f10621f4b76fbfcc0849b10d5edb4d6898ec5e guix: Add curl to required tool list (Hennadii Stepanov)
Pull request description:
On Ubuntu Hirsute (minimum installation) with the system `guix` package:
```
$ HOSTS=x86_64-linux-gnu ./contrib/guix/guix-build.sh
make: Entering directory '/home/hebasto/bitcoin/depends'
make[1]: Entering directory '/home/hebasto/bitcoin/depends'
Checksum missing or mismatched for boost source. Forcing re-download.
Fetching boost_1_71_0.tar.bz2 from https://dl.bintray.com/boostorg/release/1.71.0/source/
/bin/sh: 1: curl: not found
Fetching boost_1_71_0.tar.bz2 from https://bitcoincore.org/depends-sources
/bin/sh: 1: curl: not found
make[1]: *** [funcs.mk:276: /home/hebasto/bitcoin/depends/sources/download-stamps/.stamp_fetched-boost-boost_1_71_0.tar.bz2.hash] Error 127
make[1]: Leaving directory '/home/hebasto/bitcoin/depends'
make: *** [Makefile:281: download-linux] Error 2
make: Leaving directory '/home/hebasto/bitcoin/depends'
```
This PR fixes that issue.
ACKs for top commit:
laanwj:
ACK 97f10621f4b76fbfcc0849b10d5edb4d6898ec5e
jonasschnelli:
utACK 97f10621f4b76fbfcc0849b10d5edb4d6898ec5e
Tree-SHA512: b9e1ba966782b13e25c85d4a9cfd381bcda190244cb9821ae1a72fd51f82f23ed5e98d9a02384619e3299feb7a34e1da8b9190081a6005221f47f93ae18f3c0b
| -rwxr-xr-x | contrib/guix/guix-build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/guix/guix-build.sh b/contrib/guix/guix-build.sh index 333e18d4ed..c39e9fe9b2 100755 --- a/contrib/guix/guix-build.sh +++ b/contrib/guix/guix-build.sh @@ -9,7 +9,7 @@ set -e -o pipefail ################ # Check 1: Make sure that we can invoke required tools ################ -for cmd in git make guix cat mkdir; do +for cmd in git make guix cat mkdir curl; do if ! command -v "$cmd" > /dev/null 2>&1; then echo "ERR: This script requires that '$cmd' is installed and available in your \$PATH" exit 1 |