diff options
| author | merge-script <fanquake@gmail.com> | 2024-04-25 21:07:52 +0800 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-04-25 21:07:52 +0800 |
| commit | 10f50220724c02efe0ba38717cc64578ffb58ebc (patch) | |
| tree | 49d2a558099ac23a9826f7914ad5e5586cdef931 /doc | |
| parent | 2a07c4662d7266158d47f79fa2433ab22e22c907 (diff) | |
| parent | 3c1ae3ee33d4d9dbea046d5ab8ee924a12982759 (diff) | |
| download | bitcoin-10f50220724c02efe0ba38717cc64578ffb58ebc.tar.xz | |
Merge bitcoin/bitcoin#29708: depends: build libnatpmp with CMake
3c1ae3ee33d4d9dbea046d5ab8ee924a12982759 depends: switch libnatpmp to CMake (Cory Fields)
72ba7b5d263b6d909ae59040536a499a596237c2 depends: libnatpmp f2433bec24ca3d3f22a8a7840728a3ac177f94ba (fanquake)
Pull request description:
This picks up one of the changes from https://github.com/bitcoin/bitcoin/pull/29232, which is a switch to building libnatpmp with CMake. It includes an update to the most recent version of libnatpmp (https://github.com/miniupnp/libnatpmp/commit/f2433bec24ca3d3f22a8a7840728a3ac177f94ba), which includes (https://github.com/miniupnp/libnatpmp/pull/43).
From an initial look I couldn't find any significant difference between the Autotools and CMake produced libs.
ACKs for top commit:
m3dwards:
ACK https://github.com/bitcoin/bitcoin/pull/29708/commits/3c1ae3ee33d4d9dbea046d5ab8ee924a12982759
hebasto:
ACK 3c1ae3ee33d4d9dbea046d5ab8ee924a12982759.
TheCharlatan:
ACK 3c1ae3ee33d4d9dbea046d5ab8ee924a12982759
Tree-SHA512: 1dd9d9933a5fceb9f8c4e1d68cd5cb4456a10a6dd27a6f6316f14493f9d2efad981ef8be9570c09ca82d45163aebd7f4cb2b2449989ec6084268ddba9a564c83
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/dependencies.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/dependencies.md b/doc/dependencies.md index 1e48d225b0..4003f22b91 100644 --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -35,7 +35,7 @@ You can find installation instructions in the `build-*.md` file for your platfor ### Networking | Dependency | Releases | Version used | Minimum required | Runtime | | --- | --- | --- | --- | --- | -| [libnatpmp](../depends/packages/libnatpmp.mk) | [link](https://github.com/miniupnp/libnatpmp/) | commit [07004b9...](https://github.com/bitcoin/bitcoin/pull/25917) | | No | +| [libnatpmp](../depends/packages/libnatpmp.mk) | [link](https://github.com/miniupnp/libnatpmp/) | commit [f2433be...](https://github.com/bitcoin/bitcoin/pull/29708) | | No | | [MiniUPnPc](../depends/packages/miniupnpc.mk) | [link](https://miniupnp.tuxfamily.org/) | [2.2.2](https://github.com/bitcoin/bitcoin/pull/20421) | 2.1 | No | ### Notifications |