diff options
author | fanquake <fanquake@gmail.com> | 2021-08-16 12:13:06 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-08-16 12:17:24 +0800 |
commit | 3facf0a8ae99a03f5e2fb709b8d86c47328d363c (patch) | |
tree | 720b8818324e1b99b5255886da331bc9cf41f081 /src/addrman.h | |
parent | 820129aee9fdd0b3f238e9feef60330342d61966 (diff) | |
parent | 5100deee5822795d385570a380d3c117d05d851d (diff) | |
download | bitcoin-3facf0a8ae99a03f5e2fb709b8d86c47328d363c.tar.xz |
Merge bitcoin/bitcoin#22685: clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE
5100deee5822795d385570a380d3c117d05d851d clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE (Carl Dong)
Pull request description:
```
Previously, building from a release source tarball would result in a
version string like v22.0.0-<commithash>, but we expect just v22.0.0.
This commit solves this problem.
Also use PACKAGE_VERSION instead of reconstructing it.
```
Fixes the underlying problem of #22623
ACKs for top commit:
achow101:
ACK 5100deee5822795d385570a380d3c117d05d851d
fanquake:
ACK 5100deee5822795d385570a380d3c117d05d851d - tested that prior the output of `src/bitcoind -version` on the `22.x` branch was `Bitcoin Core version v22.0.0-d3bd5410f64e`, and with this commit cherry-picked it is `Bitcoin Core version v22.0.0rc2`.
Tree-SHA512: 78705e285ff1271d5012e888837049044db4d11d66c252c6b964685892ef078c56fe122f12daa87c71532f4352f695d1e88a228665adcd7afe3ddce3f209b49f
Diffstat (limited to 'src/addrman.h')
0 files changed, 0 insertions, 0 deletions