diff options
| author | fanquake <fanquake@gmail.com> | 2021-11-21 17:57:58 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-11-21 19:34:43 +0800 |
| commit | d0fe9c2180de4ea1549e5a22d6898d688de7f4dc (patch) | |
| tree | e81e2d2b36367333cac163ae410cd0c17b93b83e | |
| parent | 368831371d97a642beb54b5c4eb6eb0fedaa16b4 (diff) | |
| download | bitcoin-d0fe9c2180de4ea1549e5a22d6898d688de7f4dc.tar.xz | |
build: don't check for deprecated berkeley-db4 package
Fixes:
```bash
checking for brew... brew
Warning: Use berkeley-db@4 instead of deprecated berkeley-db4
```
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index eb44714df7..6cecb9b59a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -284,7 +284,7 @@ task: task: name: 'macOS 11 native [gui] [no depends]' brew_install_script: - - brew install boost libevent berkeley-db4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt + - brew install boost libevent berkeley-db@4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt << : *GLOBAL_TASK_TEMPLATE osx_instance: # Use latest image, but hardcode version to avoid silent upgrades (and breaks) diff --git a/configure.ac b/configure.ac index 0443dd9d5c..e7cfc4df97 100644 --- a/configure.ac +++ b/configure.ac @@ -683,8 +683,8 @@ case $host in dnl It's safe to add these paths even if the functionality is disabled by dnl the user (--without-wallet or --without-gui for example). - if test "x$use_bdb" != xno && $BREW list --versions berkeley-db4 >/dev/null && test "x$BDB_CFLAGS" = "x" && test "x$BDB_LIBS" = "x"; then - bdb_prefix=$($BREW --prefix berkeley-db4 2>/dev/null) + if test "x$use_bdb" != xno && $BREW list --versions berkeley-db@4 >/dev/null && test "x$BDB_CFLAGS" = "x" && test "x$BDB_LIBS" = "x"; then + bdb_prefix=$($BREW --prefix berkeley-db@4 2>/dev/null) dnl This must precede the call to BITCOIN_FIND_BDB48 below. BDB_CFLAGS="-I$bdb_prefix/include" BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8" |