From cbd9dd548864cf2d096425a6250bc0ebc96293f1 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 11 Oct 2023 18:40:01 +0800 Subject: [PATCH 1/2] use default libtool --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index f47910cab6..4785e00e6f 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -2,9 +2,6 @@ brew update -brew unlink libtool -wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0fbd6e24c4122e18ade1ec6c5916cb21de14f352/Formula/libtool.rb -brew install libtool.rb brew install autoconf \ automake \ @@ -14,6 +11,7 @@ brew install autoconf \ ninja \ gnu-sed \ coreutils \ + libtool \ llvm \ gnu-getopt From 5a5aa717f178622be8eb02ea72287aca1826382e Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 11 Oct 2023 18:42:54 +0800 Subject: [PATCH 2/2] rm conflicting links --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 4785e00e6f..7b5fdacd4a 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -1,8 +1,13 @@ #!/bin/bash -brew update - +# Workaround for https://github.com/actions/setup-python/issues/577 +rm /usr/local/bin/2to3 || true +rm /usr/local/bin/idle3 || true +rm /usr/local/bin/pydoc3 || true +rm /usr/local/bin/python3 || true +rm /usr/local/bin/python3-config || true +brew update brew install autoconf \ automake \ pkgconfig \