Skip to content

Commit db77bc8

Browse files
committed
Merge b8cf7b7 into merged_master (Elements PR ElementsProject#1412)
2 parents 5f6c1e5 + b8cf7b7 commit db77bc8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ci/test/00_setup_env_mac_native_arm64.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
export LC_ALL=C.UTF-8
88

99
export HOST=arm64-apple-darwin
10-
export PIP_PACKAGES="zmq"
10+
# Homebrew's [email protected] is marked as externally managed (PEP 668).
11+
# Therefore, `--break-system-packages` is needed.
12+
export PIP_PACKAGES="--break-system-packages zmq"
1113
export GOAL="install"
1214
# ELEMENTS: add -fno-stack-check to work around clang bug on macos
1315
export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports CXXFLAGS=-fno-stack-check"

ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fi
7676

7777
if [ -n "$PIP_PACKAGES" ]; then
7878
if [ "$CI_OS_NAME" == "macos" ]; then
79-
sudo -H pip3 install --upgrade pip
79+
sudo -H pip3 install --upgrade --break-system-packages pip
8080
# shellcheck disable=SC2086
8181
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
8282
else

0 commit comments

Comments
 (0)