From 32cc8b8a3960c8d9f524785df7acfdfad66c0a0f Mon Sep 17 00:00:00 2001 From: fruffy Date: Tue, 8 Oct 2024 08:14:14 -0400 Subject: [PATCH 1/3] Try to use Boost 1.86 instead to fix MacOS failures. Signed-off-by: fruffy --- tools/install_mac_deps.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/install_mac_deps.sh b/tools/install_mac_deps.sh index 32707cff98..4f4e1c6817 100755 --- a/tools/install_mac_deps.sh +++ b/tools/install_mac_deps.sh @@ -3,6 +3,7 @@ # Script to install P4C dependencies on MacOS. set -e # Exit on error. +set -x # Make command execution verbose # Installation helper. brew_install() { @@ -41,12 +42,14 @@ BOOST_LIB="boost@1.85" REQUIRED_PACKAGES=( autoconf automake ccache cmake libtool openssl pkg-config coreutils bison grep ninja - ${BOOST_LIB} ) for package in "${REQUIRED_PACKAGES[@]}"; do brew_install ${package} done +# The boost installation is flaky, do not fail if it fails. +brew_install ${BOOST_LIB} || echo "Failed to install ${BOOST_LIB}" + # Check if linking is needed. if ! brew ls --linked --formula ${BOOST_LIB} > /dev/null 2>&1; then brew link ${BOOST_LIB} From e868a81f732d6bf1bcba88f17af0c6f896bf25c6 Mon Sep 17 00:00:00 2001 From: fruffy Date: Tue, 8 Oct 2024 14:56:59 -0400 Subject: [PATCH 2/3] Try an approach using --overwrite. Signed-off-by: fruffy --- tools/install_mac_deps.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/install_mac_deps.sh b/tools/install_mac_deps.sh index 4f4e1c6817..567e0ef76f 100755 --- a/tools/install_mac_deps.sh +++ b/tools/install_mac_deps.sh @@ -11,7 +11,7 @@ brew_install() { if brew list $1 &>/dev/null; then echo "${1} is already installed" else - brew install $1 && echo "$1 is installed" + brew install --overwrite $1 && echo "$1 is installed" fi } @@ -42,14 +42,12 @@ BOOST_LIB="boost@1.85" REQUIRED_PACKAGES=( autoconf automake ccache cmake libtool openssl pkg-config coreutils bison grep ninja + ${BOOST_LIB} ) for package in "${REQUIRED_PACKAGES[@]}"; do brew_install ${package} done -# The boost installation is flaky, do not fail if it fails. -brew_install ${BOOST_LIB} || echo "Failed to install ${BOOST_LIB}" - # Check if linking is needed. if ! brew ls --linked --formula ${BOOST_LIB} > /dev/null 2>&1; then brew link ${BOOST_LIB} From 617db0b495b4913e58d7e53cd05f99d75f02b1f6 Mon Sep 17 00:00:00 2001 From: fruffy Date: Tue, 8 Oct 2024 15:58:01 -0400 Subject: [PATCH 3/3] Try an approach using --ignore-dependencies. Signed-off-by: fruffy --- tools/install_mac_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install_mac_deps.sh b/tools/install_mac_deps.sh index 567e0ef76f..3bc1436fe6 100755 --- a/tools/install_mac_deps.sh +++ b/tools/install_mac_deps.sh @@ -11,7 +11,7 @@ brew_install() { if brew list $1 &>/dev/null; then echo "${1} is already installed" else - brew install --overwrite $1 && echo "$1 is installed" + brew install --ignore-dependencies $1 && echo "$1 is installed" fi }