diff options
| author | fanquake <fanquake@gmail.com> | 2021-11-22 14:25:00 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-11-22 14:27:06 +0800 |
| commit | a2ed33b23bc0b4050aebd15dab5f78d9cda4d9d8 (patch) | |
| tree | b5cdccc1b255d43d365d7bbd1ef4f1d76ea9b0a6 | |
| parent | a42923ce21870e7285252b32c4e4cb300fae1e1e (diff) | |
| parent | 4d83038714e4f099529e4372ef04f8f947c3a421 (diff) | |
Merge bitcoin/bitcoin#23564: build: don't use deprecated brew package names
4d83038714e4f099529e4372ef04f8f947c3a421 build: don't check for deprecated qt5 package (fanquake)
d0fe9c2180de4ea1549e5a22d6898d688de7f4dc 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 4d83038714e4f099529e4372ef04f8f947c3a421 on macOS Big Sur
hebasto:
ACK 4d83038714e4f099529e4372ef04f8f947c3a421, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: 0eeac9e1add652bd101472880c7a6e7688a6429ce98faf920cb7f572a6471ac9af755de7f34047b17ea1d26bfc4517bd0e9f403b966de0ff361bf2942eae6a41
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 5 insertions, 5 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..8047c4188a 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" @@ -694,8 +694,8 @@ case $host in 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" + 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 case $host in |