mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-13 19:37:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin/bitcoin#26333: [23.x] Revert "build: Use Homebrew's sqlite package if it is available"

Browse source 
7698366132 doc: remove brew install sqlite from macOS docs (fanquake)
419bdc534f Revert "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 23.x branch.

ACKs for top commit:
  hebasto:
    ACK 7698366132, I have reviewed the code and it looks OK, I agree it can be merged.
  stickies-v:
    re-ACK 7698366132

Tree-SHA512: 539f218b2895188111876b6a2035082ac642c89ef2e5055031bdc4563f690055012fcede396a5c87cf66e80ced796d62dd8d4394676fa6d22e01a581b29bb10b
This commit is contained in:
MacroFake 2022-10-24 11:43:33 +02:00
commit c2d46d7434
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -721,10 +721,6 @@ case $host in
BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8" BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8"
fi fi
if test "$use_sqlite" != "no" && $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 qt@5 >/dev/null; then if $BREW list --versions qt@5 >/dev/null; then
export PKG_CONFIG_PATH="$($BREW --prefix qt@5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$($BREW --prefix qt@5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
fi fi

10
doc/build-osx.md
View file

@ -112,15 +112,11 @@ brew install berkeley-db@4
###### Descriptor Wallet Support ###### Descriptor Wallet Support
Note: Apple has included a useable `sqlite` package since macOS 10.14. `sqlite` is required to support for descriptor wallets.
You may not need to install this package.
`sqlite` is required to enable support for descriptor wallets. macOS ships with a useable `sqlite` package, meaning you don't need to
Skip if you don't intend to use descriptor wallets. install anything.
``` bash
brew install sqlite
```
--- ---
#### GUI Dependencies #### GUI Dependencies