diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-10-24 11:43:33 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-10-24 11:43:37 +0200 |
| commit | c2d46d7434b307595e58ddf9a1d8a3f3b66eb221 (patch) | |
| tree | 4825055d5fc4149e37b1cb4fce8eab7a3422764e | |
| parent | 45c9f4afa41472d9aadd65e9dfc7eb879d116ca4 (diff) | |
| parent | 769836613291e2b35f8ded9b594e33dcd1b1c70d (diff) | |
| download | bitcoin-c2d46d7434b307595e58ddf9a1d8a3f3b66eb221.tar.xz | |
Merge bitcoin/bitcoin#26333: [23.x] Revert "build: Use Homebrew's sqlite package if it is available"
769836613291e2b35f8ded9b594e33dcd1b1c70d doc: remove brew install sqlite from macOS docs (fanquake)
419bdc534f885de4574e054cfcac6869f7a4e185 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 769836613291e2b35f8ded9b594e33dcd1b1c70d, I have reviewed the code and it looks OK, I agree it can be merged.
stickies-v:
re-ACK https://github.com/bitcoin/bitcoin/commit/769836613291e2b35f8ded9b594e33dcd1b1c70d
Tree-SHA512: 539f218b2895188111876b6a2035082ac642c89ef2e5055031bdc4563f690055012fcede396a5c87cf66e80ced796d62dd8d4394676fa6d22e01a581b29bb10b
| -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 6ae8b778b1..eef4b41973 100644 --- a/configure.ac +++ b/configure.ac @@ -721,10 +721,6 @@ case $host in BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8" 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 export PKG_CONFIG_PATH="$($BREW --prefix qt@5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH" fi diff --git a/doc/build-osx.md b/doc/build-osx.md index 685b0c3629..0cc1ccd57b 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -112,15 +112,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 |