Skip to content

Commit 6ac637f

Browse files
committed
Merge bitcoin/bitcoin#24288: build, refactor: Drop redundant $(package)_download_file assignments
d644c45 build, refactor: Drop redundant `$(package)_download_file` assignments (Hennadii Stepanov) Pull request description: No need to specify `$(package)_download_file` when it is equal to `$(package)_file_name`. Historically, before bitcoin/bitcoin#19817, distinct `$(package)_download_file` and `$(package)_file_name` were used for better portability (I guess) by removing `+` characters from a file name. The only package which still use file renaming is `native_capnp`: https://github.com/bitcoin/bitcoin/blob/eca694a4e78d54ce4e29b388b3e81b06e55c2293/depends/packages/native_capnp.mk#L3-L5 ACKs for top commit: shaavan: ACK d644c45 fanquake: ACK d644c45 Tree-SHA512: 488dd0f55cea077174e78a75d8385bacb1a5463883cadeb5fd7c9426865ea5f3a8bad0bd6e8e9d530bce6f0c1715349b3fbabb4e22634348cdd68f5fc8a3c53b
2 parents 8ac7997 + d644c45 commit 6ac637f

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

depends/packages/native_clang.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ package=native_clang
22
$(package)_version=10.0.1
33
$(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
44
ifneq (,$(findstring aarch64,$(BUILD)))
5-
$(package)_download_file=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
65
$(package)_file_name=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
76
$(package)_sha256_hash=90dc69a4758ca15cd0ffa45d07fbf5bf4309d47d2c7745a9f0735ecffde9c31f
87
else
9-
$(package)_download_file=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
108
$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
119
$(package)_sha256_hash=48b83ef827ac2c213d5b64f5ad7ed082c8bcb712b46644e0dc5045c6f462c231
1210
endif

depends/packages/native_libtapi.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package=native_libtapi
22
$(package)_version=664b8414f89612f2dfd35a9b679c345aa5389026
33
$(package)_download_path=https://github.com/tpoechtrager/apple-libtapi/archive
4-
$(package)_download_file=$($(package)_version).tar.gz
54
$(package)_file_name=$($(package)_version).tar.gz
65
$(package)_sha256_hash=62e419c12d1c9fad67cc1cd523132bc00db050998337c734c15bc8d73cc02b61
76

0 commit comments

Comments
 (0)