Skip to content

Commit

Permalink
qa: Use packaged bdb5 install script for macos native CI
Browse files Browse the repository at this point in the history
- Self-compile bdb5.3 using contrib/install_db5.sh
- Enable posixthreads flag on bdb5 macos native compilation
- Install db5 files into an absolute path
- Add the BDB_LIBS and BDB_CLFAGS env vars to ./configure

Co-authored-by: Ross Nicoll <jrn@jrn.me.uk>
  • Loading branch information
patricklodder and Ross Nicoll committed Mar 23, 2022
1 parent 2ada4ad commit e9c393b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Expand Up @@ -138,7 +138,7 @@ task:
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
brew_install_script:
- brew update
- brew install boost libevent berkeley-db4 qt@5 miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
- brew install boost libevent qt@5 miniupnpc 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)
Expand Down
3 changes: 2 additions & 1 deletion ci/test/00_setup_env_mac_host.sh
Expand Up @@ -9,7 +9,8 @@ export LC_ALL=C.UTF-8
export HOST=x86_64-apple-darwin16
export PIP_PACKAGES="zmq"
export GOAL="install"
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --with-boost-process"
export BDB_PREFIX="${BASE_ROOT_DIR}/db5"
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --with-boost-process BDB_LIBS='-L${BDB_PREFIX}/lib -ldb_cxx-5.3' BDB_CFLAGS='-I${BDB_PREFIX}/include'"
export CI_OS_NAME="macos"
export NO_DEPENDS=1
export OSX_SDK=""
Expand Down
5 changes: 5 additions & 0 deletions ci/test/05_before_script.sh
Expand Up @@ -31,6 +31,11 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
DOCKER_EXEC "contrib/install_db5.sh \$(pwd) --enable-umrw CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
fi

if [[ $HOST = *-apple-darwin16 ]]; then
# Use BDB compiled using install_db5.sh script as Brew does not supply BDB 5.3
DOCKER_EXEC "contrib/install_db5.sh \$BASE_ROOT_DIR --enable-posixmutexes"
fi

if [ -n "$XCODE_VERSION" ] && [ -f "$OSX_SDK_PATH" ]; then
DOCKER_EXEC tar -C "${DEPENDS_DIR}/SDKs" -xf "$OSX_SDK_PATH"
fi
Expand Down

0 comments on commit e9c393b

Please sign in to comment.