diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-10-29 12:03:31 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-10-29 12:03:36 +0100 |
| commit | f3727fd73538b3a097559cc1005c08caa2bdf1dd (patch) | |
| tree | 21e703c3f0b36318ac970316d1cf79fc1bd7739c /doc | |
| parent | 924a4ff7eb626185684a4524bb0acea7e2904db8 (diff) | |
| parent | bbb42a68961a8ae1e4ef3221ffb1d5ff7272b075 (diff) | |
| download | bitcoin-f3727fd73538b3a097559cc1005c08caa2bdf1dd.tar.xz | |
Merge #20156: build: Make sqlite support optional (compile-time)
bbb42a68961a8ae1e4ef3221ffb1d5ff7272b075 RPC: createwallet: Nicer error message if descriptor wallet requested and sqlite support not compiled in (Luke Dashjr)
6608fec332eac4dfd91138bc4fe2e1b5c7bb758f GUI: Create Wallet: Nicely disable descriptor wallet checkbox if sqlite support not compiled in (Luke Dashjr)
7b54d768e1514b328e1ac108d3db2f1bac3ba7ff Make sqlite support optional (compile-time) (Luke Dashjr)
Pull request description:
As a new requirement, sqlite support should be optional. This PR aims to be only minimum/blocker changes for 0.21.
Potential follow-up PRs after this:
* Make BDB support optional
* Nicer error messages when user tries to load an unsupported wallet
* Don't compile descriptor wallet code if sqlite disabled
ACKs for top commit:
jonasschnelli:
Tested ACK bbb42a68961a8ae1e4ef3221ffb1d5ff7272b075
achow101:
ACK bbb42a68961a8ae1e4ef3221ffb1d5ff7272b075
Sjors:
re-utACK bbb42a68961a8ae1e4ef3221ffb1d5ff7272b075
hebasto:
ACK bbb42a68961a8ae1e4ef3221ffb1d5ff7272b075, tested on Linux Mint 20 (x86_64, Qt 5.12.8).
Tree-SHA512: 500209dd1971310fab8ae51543343ce0ba91f088ccccff6109b4cc27547cd5532289dca6cb7dac2a7d7c59cdf3c8f5aacc31e9b0f912e38cea52ec26b97100bd
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build-unix.md | 2 | ||||
| -rw-r--r-- | doc/dependencies.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/build-unix.md b/doc/build-unix.md index c076fb6fff..ab83ceff3d 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -46,7 +46,7 @@ Optional dependencies: libqrencode | QR codes in GUI | Optional for generating QR codes (only needed when GUI enabled) univalue | Utility | JSON parsing and encoding (bundled version will be used unless --with-system-univalue passed to configure) libzmq3 | ZMQ notification | Optional, allows generating ZMQ notifications (requires ZMQ version >= 4.0.0) - sqlite3 | SQLite DB | Wallet storage (only needed when wallet enabled) + sqlite3 | SQLite DB | Optional, wallet storage (only needed when wallet enabled) For the versions used, see [dependencies.md](dependencies.md) diff --git a/doc/dependencies.md b/doc/dependencies.md index ddd50ef296..d1bf4b3a87 100644 --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -34,7 +34,7 @@ Some dependencies are not needed in all configurations. The following are some f #### Options passed to `./configure` * MiniUPnPc is not needed with `--with-miniupnpc=no`. * Berkeley DB is not needed with `--disable-wallet`. -* SQLite is not needed with `--disable-wallet`. +* SQLite is not needed with `--disable-wallet` or `--without-sqlite`. * Qt is not needed with `--without-gui`. * If the qrencode dependency is absent, QR support won't be added. To force an error when that happens, pass `--with-qrencode`. * ZeroMQ is needed only with the `--with-zmq` option. |