Skip to content

Commit d0fe9c2

Browse files
committed
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 ```
1 parent 3688313 commit d0fe9c2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ task:
284284
task:
285285
name: 'macOS 11 native [gui] [no depends]'
286286
brew_install_script:
287-
- brew install boost libevent berkeley-db4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
287+
- brew install boost libevent berkeley-db@4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
288288
<< : *GLOBAL_TASK_TEMPLATE
289289
osx_instance:
290290
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,8 +683,8 @@ case $host in
683683
dnl It's safe to add these paths even if the functionality is disabled by
684684
dnl the user (--without-wallet or --without-gui for example).
685685

686-
if test "x$use_bdb" != xno && $BREW list --versions berkeley-db4 >/dev/null && test "x$BDB_CFLAGS" = "x" && test "x$BDB_LIBS" = "x"; then
687-
bdb_prefix=$($BREW --prefix berkeley-db4 2>/dev/null)
686+
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
687+
bdb_prefix=$($BREW --prefix berkeley-db@4 2>/dev/null)
688688
dnl This must precede the call to BITCOIN_FIND_BDB48 below.
689689
BDB_CFLAGS="-I$bdb_prefix/include"
690690
BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8"

0 commit comments

Comments
 (0)