phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
63d2ee9a50 doc: remove brew install sqlite from macOS docs (fanquake)
bf42d7de56 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 22.x branch.

ACKs for top commit:
  hebasto:
    ACK 63d2ee9a50, 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:
MacroFake 2022-10-24 11:44:31 +02:00
commit 2d3161fdd5
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

@ -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

10
doc/build-osx.md
View file

@ -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