Skip to content

Commit a2ed33b

Browse files
committed
Merge bitcoin/bitcoin#23564: build: don't use deprecated brew package names
4d83038 build: don't check for deprecated qt5 package (fanquake) d0fe9c2 build: don't check for deprecated berkeley-db4 package (fanquake) Pull request description: Fixes: ```bash checking for brew... brew Warning: Use berkeley-db@4 instead of deprecated berkeley-db4 ``` on macOS. ACKs for top commit: mjdietzx: Tested ACK 4d83038 on macOS Big Sur hebasto: ACK 4d83038, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 0eeac9e1add652bd101472880c7a6e7688a6429ce98faf920cb7f572a6471ac9af755de7f34047b17ea1d26bfc4517bd0e9f403b966de0ff361bf2942eae6a41
2 parents a42923c + 4d83038 commit a2ed33b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
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: 4 additions & 4 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"
@@ -694,8 +694,8 @@ case $host in
694694
export PKG_CONFIG_PATH="$($BREW --prefix sqlite3 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
695695
fi
696696

697-
if $BREW list --versions qt5 >/dev/null; then
698-
export PKG_CONFIG_PATH="$($BREW --prefix qt5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
697+
if $BREW list --versions qt@5 >/dev/null; then
698+
export PKG_CONFIG_PATH="$($BREW --prefix qt@5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
699699
fi
700700

701701
case $host in

0 commit comments

Comments
 (0)