diff options
| author | fanquake <fanquake@gmail.com> | 2022-02-13 11:17:33 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-02-13 11:22:36 +0000 |
| commit | 25a91a571a4f3453f7e0e9299ee7a40a61d04f19 (patch) | |
| tree | a6dcd9d3983062472c647635029df2179a8af42e | |
| parent | b1aa3b1959cab1ad8bb6d0a6a5d05c87c1271cdb (diff) | |
| parent | edc9a6afdc6926b40de2fed897b9b866d58f28d2 (diff) | |
| download | bitcoin-25a91a571a4f3453f7e0e9299ee7a40a61d04f19.tar.xz | |
Merge bitcoin/bitcoin#24276: build, refactor: Improve package version usage
edc9a6afdc6926b40de2fed897b9b866d58f28d2 build, refactor: Reuse expat package version in its download path (Hennadii Stepanov)
4bb7821ab243325467a89ff8ffc1bed290f2cb58 build, refactor: Use conventional version notation for boost package (Hennadii Stepanov)
Pull request description:
`boost` package:
- `.` is used as a separator in versions of other depends packages.
`expat` package:
- reuse package version in its download path
---
The straightforward way to verify this PR:
```
$ cd depends
$ make clean-all
$ make boost_fetched
$ make expat_fetched
```
ACKs for top commit:
prusnak:
ACK edc9a6a
shaavan:
ACK edc9a6afdc6926b40de2fed897b9b866d58f28d2
Tree-SHA512: c15d672fe34ac59850425d3d6a6eee5f720e16d227aad1332a563b218465879b7ee6fb865dd1bac06aedf356f9bb1c67112d9d88da8f877f04838b50a9dc97be
| -rw-r--r-- | depends/packages/boost.mk | 6 | ||||
| -rw-r--r-- | depends/packages/expat.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 6c2dd9ea08..3c849b1e8d 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,7 +1,7 @@ package=boost -$(package)_version=1_71_0 -$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/ -$(package)_file_name=boost_$($(package)_version).tar.bz2 +$(package)_version=1.71.0 +$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/ +$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2 $(package)_sha256_hash=d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee $(package)_dependencies=native_b2 $(package)_patches=fix_openbsd_test_lib.patch diff --git a/depends/packages/expat.mk b/depends/packages/expat.mk index c2089d1ccb..50791ebc6e 100644 --- a/depends/packages/expat.mk +++ b/depends/packages/expat.mk @@ -1,6 +1,6 @@ package=expat $(package)_version=2.4.1 -$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_2_4_1/ +$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$($(package)_version))/ $(package)_file_name=$(package)-$($(package)_version).tar.xz $(package)_sha256_hash=cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a |