diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-03-17 21:13:33 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-03-17 21:13:39 +0100 |
| commit | e09cf64c48286176e7d080edfe901f47baa0a418 (patch) | |
| tree | cbc0321186d09c99c8dfc7b1d8ab5c6a1fff6f40 /doc/build-osx.md | |
| parent | 8435d7f11a89bb3f93306646f62cc2179693e072 (diff) | |
| parent | 57f3f5cecfac45b3f399ff174905dca25ca556b5 (diff) | |
Merge bitcoin/bitcoin#24585: doc: mention that BDB is for the legacy wallet in build-osx.md
57f3f5cecfac45b3f399ff174905dca25ca556b5 doc: s/Compiler/Dependency in dependencies.md (fanquake)
bf846779caf13673d4daca190a652c4e14b2200b doc: cleanup wallet docs in build-osx.md (fanquake)
Pull request description:
Re-order legacy and descriptor wallet section.
Installing sqlite isn't required (the version pre-installed on macOS is just as good as what will be installed via `brew`).
Remove prelude that pointlessly repeats the same info.
Basically the macOS version of #23446.
Includes a small fixup from #23565.
ACKs for top commit:
RandyMcMillan:
ACK 57f3f5c
hebasto:
ACK 57f3f5cecfac45b3f399ff174905dca25ca556b5, I have reviewed the changes and they look OK, I agree they can be merged.
Tree-SHA512: a1ca5f73aa4f4f56de747fd9669bce572c1d7d23925afb47b5d963314df1738762ea26428c040e9c706d288eb7e775227d2387a322cda065885b89c6a619314f
Diffstat (limited to 'doc/build-osx.md')
| -rw-r--r-- | doc/build-osx.md | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/doc/build-osx.md b/doc/build-osx.md index 84495cfdaf..fdf0a9d414 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -66,29 +66,21 @@ git clone https://github.com/bitcoin/bitcoin.git #### Wallet Dependencies It is not necessary to build wallet functionality to run `bitcoind` or `bitcoin-qt`. -To enable legacy wallets, you must install `berkeley-db@4`. -To enable [descriptor wallets](https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md), `sqlite` is required. -Skip `berkeley-db@4` if you intend to *exclusively* use descriptor wallets. -###### Legacy Wallet Support +###### Descriptor Wallet Support -`berkeley-db@4` is required to enable support for legacy wallets. -Skip if you don't intend to use legacy wallets. +`sqlite` is required to support for descriptor wallets. -``` bash -brew install berkeley-db@4 -``` +macOS ships with a useable `sqlite` package, meaning you don't need to +install anything. -###### Descriptor Wallet Support - -Note: Apple has included a useable `sqlite` package since macOS 10.14. -You may not need to install this package. +###### Legacy Wallet Support -`sqlite` is required to enable support for descriptor wallets. -Skip if you don't intend to use descriptor wallets. +`berkeley-db@4` is only required to support for legacy wallets. +Skip if you don't intend to use legacy wallets. ``` bash -brew install sqlite +brew install berkeley-db@4 ``` --- |