mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-19 23:03:45 +01:00
Merge bitcoin/bitcoin#26350: [22.x] Revert "build: Use Homebrew's sqlite package if it is available"
63d2ee9a50doc: remove brew install sqlite from macOS docs (fanquake)bf42d7de56Revert "build: Use Homebrew's sqlite package if it is available" (fanquake) Pull request description: Backport of https://github.com/bitcoin/bitcoin/pull/25985 to the 22.x branch. ACKs for top commit: hebasto: ACK63d2ee9a50, I have reviewed the code and it looks OK, I agree it can be merged. stickies-v: re-ACK [63d2ee9](63d2ee9a50) Tree-SHA512: 66738fc67df86db536a500fe253257976208b31773b891d6b6865b795ba4c933345febcc81773db159d3e1078810dbc8053fe63a7e9acad25b28d02dbf2687e8
This commit is contained in:
@@ -696,10 +696,6 @@ case $host in
|
||||
BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8"
|
||||
fi
|
||||
|
||||
if test "x$use_sqlite" != xno && $BREW list --versions sqlite3 >/dev/null; then
|
||||
export PKG_CONFIG_PATH="$($BREW --prefix sqlite3 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
fi
|
||||
|
||||
if $BREW list --versions qt5 >/dev/null; then
|
||||
export PKG_CONFIG_PATH="$($BREW --prefix qt5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
fi
|
||||
|
||||
@@ -115,15 +115,11 @@ brew install berkeley-db@4
|
||||
|
||||
###### Descriptor Wallet Support
|
||||
|
||||
Note: Apple has included a useable `sqlite` package since macOS 10.14.
|
||||
You may not need to install this package.
|
||||
`sqlite` is required to support for descriptor wallets.
|
||||
|
||||
`sqlite` is required to enable support for descriptor wallets.
|
||||
Skip if you don't intend to use descriptor wallets.
|
||||
macOS ships with a useable `sqlite` package, meaning you don't need to
|
||||
install anything.
|
||||
|
||||
``` bash
|
||||
brew install sqlite
|
||||
```
|
||||
---
|
||||
|
||||
#### GUI Dependencies
|
||||
|
||||
Reference in New Issue
Block a user