Skip to content

Commit e09cf64

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24585: doc: mention that BDB is for the legacy wallet in build-osx.md
57f3f5c doc: s/Compiler/Dependency in dependencies.md (fanquake) bf84677 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 57f3f5c, I have reviewed the changes and they look OK, I agree they can be merged. Tree-SHA512: a1ca5f73aa4f4f56de747fd9669bce572c1d7d23925afb47b5d963314df1738762ea26428c040e9c706d288eb7e775227d2387a322cda065885b89c6a619314f
2 parents 8435d7f + 57f3f5c commit e09cf64

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

doc/build-osx.md

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,21 @@ git clone https://github.com/bitcoin/bitcoin.git
6666
#### Wallet Dependencies
6767

6868
It is not necessary to build wallet functionality to run `bitcoind` or `bitcoin-qt`.
69-
To enable legacy wallets, you must install `berkeley-db@4`.
70-
To enable [descriptor wallets](https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md), `sqlite` is required.
71-
Skip `berkeley-db@4` if you intend to *exclusively* use descriptor wallets.
7269

73-
###### Legacy Wallet Support
70+
###### Descriptor Wallet Support
7471

75-
`berkeley-db@4` is required to enable support for legacy wallets.
76-
Skip if you don't intend to use legacy wallets.
72+
`sqlite` is required to support for descriptor wallets.
7773

78-
``` bash
79-
brew install berkeley-db@4
80-
```
74+
macOS ships with a useable `sqlite` package, meaning you don't need to
75+
install anything.
8176

82-
###### Descriptor Wallet Support
83-
84-
Note: Apple has included a useable `sqlite` package since macOS 10.14.
85-
You may not need to install this package.
77+
###### Legacy Wallet Support
8678

87-
`sqlite` is required to enable support for descriptor wallets.
88-
Skip if you don't intend to use descriptor wallets.
79+
`berkeley-db@4` is only required to support for legacy wallets.
80+
Skip if you don't intend to use legacy wallets.
8981

9082
``` bash
91-
brew install sqlite
83+
brew install berkeley-db@4
9284
```
9385
---
9486

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ These are the dependencies used by Bitcoin Core.
44
You can find installation instructions in the `build-*.md` file for your platform.
55
"Runtime" and "Version Used" are both in reference to the release binaries.
66

7-
| Compiler | Minimum required |
7+
| Dependency | Minimum required |
88
| --- | --- |
99
| [Autoconf](https://www.gnu.org/software/autoconf/) | [2.69](https://github.com/bitcoin/bitcoin/pull/17769) |
1010
| [Automake](https://www.gnu.org/software/automake/) | [1.13](https://github.com/bitcoin/bitcoin/pull/18290) |

0 commit comments

Comments
 (0)