diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-10-24 11:44:31 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-10-24 11:44:51 +0200 |
| commit | 2d3161fdd5787632a1a2d3bb1a749a6eb3072cf2 (patch) | |
| tree | 2f4f17e4a2547c9099d10c29365e47ddb8405b25 | |
| parent | cfb0eea91e4b38f52f0c3ee67351882f84ace6ea (diff) | |
| parent | 63d2ee9a50c5690df08f25e6840d10be8232f106 (diff) | |
| download | bitcoin-2d3161fdd5787632a1a2d3bb1a749a6eb3072cf2.tar.xz | |
Merge bitcoin/bitcoin#26350: [22.x] Revert "build: Use Homebrew's sqlite package if it is available"
63d2ee9a50c5690df08f25e6840d10be8232f106 doc: remove brew install sqlite from macOS docs (fanquake)
bf42d7de56404b0afe23d81c6b758d1e9cffdf7b 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 63d2ee9a50c5690df08f25e6840d10be8232f106, I have reviewed the code and it looks OK, I agree it can be merged.
stickies-v:
re-ACK [63d2ee9](https://github.com/bitcoin/bitcoin/commit/63d2ee9a50c5690df08f25e6840d10be8232f106)
Tree-SHA512: 66738fc67df86db536a500fe253257976208b31773b891d6b6865b795ba4c933345febcc81773db159d3e1078810dbc8053fe63a7e9acad25b28d02dbf2687e8
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/build-osx.md | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 0d36313619..317b3949a0 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/doc/build-osx.md b/doc/build-osx.md index 467feff410..4a721f6fa6 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -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 |