Skip to content

Commit 02f6758

Browse files
committed
Merge bitcoin/bitcoin#33233: doc: follow-ups to "Add bitcoin-{node,gui} to release binaries for IPC"
de65c86 doc: capnproto instruction for Alpine and Arch (Sjors Provoost) 49d1a1a doc: add capnproto-devel to Fedora build instruction (Sjors Provoost) eab5518 doc: mark bitcoin-{node,gui} installed in files.md (Sjors Provoost) 2a815d1 doc: link to capnp version bump PR (Sjors Provoost) Pull request description: - have `dependencies.md` link to the PR that updated the capnp version: bitcoin/bitcoin#31802 (comment) ACKs for top commit: maflcko: lgtm ACK de65c86 janb84: re ACK de65c86 Tree-SHA512: 842d7a89ef18a8c597ca05720c41a72e67500bc93430cf2c3b074cb2f4b936f1df58b5b1e99010e1ea5c1f8a9f8875fb9c20398f915feeacecee9b2fed3cb03c
2 parents 682bd04 + de65c86 commit 02f6758

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

doc/build-unix.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ User-Space, Statically Defined Tracing (USDT) dependencies:
122122

123123
Cap'n Proto is needed for IPC functionality (see [multiprocess.md](multiprocess.md)):
124124

125-
sudo dnf install capnproto
125+
sudo dnf install capnproto capnproto-devel
126126

127127
Compile with `-DENABLE_IPC=OFF` if you do not need IPC functionality.
128128

@@ -163,6 +163,12 @@ SQLite is required for the wallet:
163163

164164
To build Bitcoin Core without the wallet, see [*Disable-wallet mode*](#disable-wallet-mode)
165165

166+
Cap'n Proto is needed for IPC functionality (see [multiprocess.md](multiprocess.md)):
167+
168+
apk add capnproto capnproto-dev
169+
170+
Compile with `-DENABLE_IPC=OFF` if you do not need IPC functionality.
171+
166172
ZMQ dependencies (provides ZMQ API):
167173

168174
apk add zeromq-dev
@@ -205,7 +211,7 @@ Setup and Build Example: Arch Linux
205211
-----------------------------------
206212
This example lists the steps necessary to setup and build a command line only distribution of the latest changes on Arch Linux:
207213

208-
pacman --sync --needed cmake boost gcc git libevent make python sqlite
214+
pacman --sync --needed capnproto cmake boost gcc git libevent make python sqlite
209215
git clone https://github.com/bitcoin/bitcoin.git
210216
cd bitcoin/
211217
cmake -B build

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Bitcoin Core requires one of the following compilers.
3535

3636
| Dependency | Releases | Minimum required |
3737
| --- | --- | --- |
38-
| [Cap'n Proto](../depends/packages/capnp.mk) | [link](https://capnproto.org) | [0.7.1](https://capnproto.org/install.html) |
38+
| [Cap'n Proto](../depends/packages/capnp.mk) | [link](https://capnproto.org) | [0.7.1](https://github.com/bitcoin/bitcoin/pull/28907) |
3939
| Python (scripts, tests) | [link](https://www.python.org) | [3.10](https://github.com/bitcoin/bitcoin/pull/30527) |
4040
| [Qt](../depends/packages/qt.mk) (gui) | [link](https://download.qt.io/archive/qt/) | [6.2](https://github.com/bitcoin/bitcoin/pull/30997) |
4141
| [qrencode](../depends/packages/qrencode.mk) (gui) | [link](https://fukuchi.org/works/qrencode/) | N/A |

doc/files.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ This table describes the files installed by Bitcoin Core across different platfo
150150
| *lib/pkgconfig/libbitcoinkernel.pc* | Pkg-config metadata for linking to `libbitcoinkernel` |
151151
| *libexec/bench_bitcoin* | Benchmarking tool for measuring node performance |
152152
| *libexec/bitcoin-chainstate* | Tool to validate and connect blocks |
153-
| *libexec/bitcoin-gui* | IPC-enabled alternative to `bitcoin-qt` |
154-
| *libexec/bitcoin-node* | IPC-enabled alternative to `bitcoind` |
153+
| libexec/bitcoin-gui | IPC-enabled alternative to `bitcoin-qt` |
154+
| libexec/bitcoin-node | IPC-enabled alternative to `bitcoind` |
155155
| libexec/test_bitcoin | Unit test binary |
156156
| *libexec/test_bitcoin-qt* | GUI-specific unit tests |
157157
| share/man/man1/ | Man pages for command-line tools like `bitcoin-cli`, `bitcoind`, and others |

0 commit comments

Comments
 (0)