From cd6c20969e2bdde80090c4ae8a0f6f4da5796290 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Thu, 11 May 2023 18:03:50 +0200 Subject: [PATCH] fix dependencies --- .../workflows/scripts/install_deps_linux_arm64_ssl3.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh index 15cfcce..6272d92 100755 --- a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh @@ -13,20 +13,20 @@ echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(ls apt-get --assume-yes update # Install and bypass a bug in the cross-platform libc++ packages -apt-get --assume-yes autoremove libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:arm64 libc++abi-14-dev:arm64 libunwind-14-dev:arm64 +apt-get --assume-yes autoremove libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 || true +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install --reinstall libc++-14-dev:arm64 libc++abi-14-dev:arm64 libunwind-14-dev:arm64 rm -r \ /usr/lib/aarch64-linux-gnu/libc++abi.so \ /usr/lib/aarch64-linux-gnu/libc++abi.so.1.0 \ /usr/lib/aarch64-linux-gnu/libc++.so.1.0 \ - /usr/lib/aarch64-linux-gnu/libunwind.so.1.0 + /usr/lib/aarch64-linux-gnu/libunwind.so.1.0 || true mv -t /usr/lib/aarch64-linux-gnu/ \ /usr/lib/llvm-14/lib/libc++abi.so \ /usr/lib/llvm-14/lib/libc++abi.so.1.0 \ /usr/lib/llvm-14/lib/libc++.so \ /usr/lib/llvm-14/lib/libc++.so.1.0 \ - /usr/lib/llvm-14/lib/libunwind.so.1.0 -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev libc++abi-14-dev libunwind-14-dev + /usr/lib/llvm-14/lib/libunwind.so.1.0 || true +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install --reinstall libc++-14-dev libc++abi-14-dev libunwind-14-dev # End libc++ packages bugfix # Add arm64 common files