diff options
| author | fanquake <fanquake@gmail.com> | 2022-02-03 10:44:00 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-02-03 10:44:17 +0800 |
| commit | 0f43fb5d874581a3a8bd54f2050817af3fe2999e (patch) | |
| tree | 5b13e20aa4d4479729d4f464a1ce4f4e6d84b402 /depends | |
| parent | c545a7aeb1d559377933c7b2e6edc2d4a37b33fb (diff) | |
| parent | 01e121d29087db047e4bc01bd64d054f83cfc5df (diff) | |
Merge bitcoin/bitcoin#24240: depends: fix capnp's descriptor for make download
01e121d29087db047e4bc01bd64d054f83cfc5df depends: fix capnp's descriptor for make download (Cory Fields)
Pull request description:
The non-native capnp was trying to fetch the wrong file.
Without this, "make -C depends MULTIPROCESS=1 download" is broken.
Presumably it breaks with the download target because the dependency graph is flattened. It manages to work if native_capnp is encountered first because it will then be found in the cache.
ACKs for top commit:
gruve-p:
tACK https://github.com/bitcoin/bitcoin/pull/24240/commits/01e121d29087db047e4bc01bd64d054f83cfc5df
hebasto:
ACK 01e121d29087db047e4bc01bd64d054f83cfc5df, tested on Linux Mint 20.2 (x86_64).
Tree-SHA512: 2605d895f3799be5a311f6f7d36a5c13cdb715dc148915ad818f4afc7d5de92cd6b8ecd34ff2b21cef6743b090819bba1e3353096cfb5659c55f76113ce5adf3
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/capnp.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk index abeb26545f..8a3a14810d 100644 --- a/depends/packages/capnp.mk +++ b/depends/packages/capnp.mk @@ -1,6 +1,7 @@ package=capnp $(package)_version=$(native_$(package)_version) $(package)_download_path=$(native_$(package)_download_path) +$(package)_download_file=$(native_$(package)_download_file) $(package)_file_name=$(native_$(package)_file_name) $(package)_sha256_hash=$(native_$(package)_sha256_hash) $(package)_dependencies=native_$(package) |