From 3fd4c9aa8947d8e808651b439cb30f59488d5f84 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 26 Aug 2023 10:25:13 +0200 Subject: [PATCH] Remove dependency --- .github/workflows/scripts/install_deps_linux_386_ssl3.sh | 4 ++-- .github/workflows/scripts/install_deps_linux_arm64_ssl1.sh | 4 ++-- .github/workflows/scripts/install_deps_linux_arm64_ssl3.sh | 4 ++-- .github/workflows/scripts/install_deps_linux_armhf_ssl3.sh | 4 ++-- .github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh | 4 ++-- .github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/scripts/install_deps_linux_386_ssl3.sh b/.github/workflows/scripts/install_deps_linux_386_ssl3.sh index 83823aa..78d0034 100755 --- a/.github/workflows/scripts/install_deps_linux_386_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_386_ssl3.sh @@ -12,12 +12,12 @@ 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:*" "libunwind-14:*" || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:i386 libc++abi-14-dev:i386 libc++1-14:i386 libunwind-14-dev:i386 libunwind-14:i386 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:i386 libc++abi-14-dev:i386 libunwind-14-dev:i386 libunwind-14:i386 # shellcheck disable=SC2016 find /usr/lib/ -path "*-linux-*" -lname "*llvm*" -print0 | xargs -0 -I{} sh -c 'cp --remove-destination $(realpath "{}") "{}"' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libunwind.so.1" "{}/libunwind.so" || true' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libc++.so.1" "{}/libc++.so" || true' -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libunwind-14-dev libunwind-14 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libunwind-14-dev libunwind-14 # End libc++ packages bugfix # Add i386 common files diff --git a/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh index 882464a..1a42355 100755 --- a/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh +++ b/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh @@ -16,12 +16,12 @@ apt-get --assume-yes update # Install and bypass a bug in the cross-platform libc++ packages apt-get --assume-yes autoremove "libc++-12-dev:*" "libc++abi-12-dev:*" "libc++1-12:*" "libc++abi1-12:*" || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-12-dev:arm64 libc++abi-12-dev:arm64 libc++1-12:arm64 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-12-dev:arm64 libc++abi-12-dev:arm64 # shellcheck disable=SC2016 find /usr/lib/ -path "*-linux-*" -lname "*llvm*" -print0 | xargs -0 -I{} sh -c 'cp --remove-destination $(realpath "{}") "{}"' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libunwind.so.1" "{}/libunwind.so" || true' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libc++.so.1" "{}/libc++.so" || true' -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-12 libc++-12-dev libc++abi-12-dev libc++1-12 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-12 libc++-12-dev libc++abi-12-dev # End libc++ packages bugfix # Add arm64 common files diff --git a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh index 2081374..bc3767c 100755 --- a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh @@ -16,12 +16,12 @@ 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:*" "libunwind-14:*" || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:arm64 libc++abi-14-dev:arm64 libc++1-14:arm64 libunwind-14-dev:arm64 libunwind-14:arm64 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:arm64 libc++abi-14-dev:arm64 libunwind-14-dev:arm64 libunwind-14:arm64 # shellcheck disable=SC2016 find /usr/lib/ -path "*-linux-*" -lname "*llvm*" -print0 | xargs -0 -I{} sh -c 'cp --remove-destination $(realpath "{}") "{}"' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libunwind.so.1" "{}/libunwind.so" || true' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libc++.so.1" "{}/libc++.so" || true' -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libunwind-14-dev libunwind-14 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libunwind-14-dev libunwind-14 # End libc++ packages bugfix # Add arm64 common files diff --git a/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh b/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh index 27d93cd..6be6023 100755 --- a/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh @@ -16,12 +16,12 @@ 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:*" "libunwind-14:*" || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:armhf libc++abi-14-dev:armhf libc++1-14:armhf libunwind-14-dev:armhf libunwind-14:armhf +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:armhf libc++abi-14-dev:armhf libunwind-14-dev:armhf libunwind-14:armhf # shellcheck disable=SC2016 find /usr/lib/ -path "*-linux-*" -lname "*llvm*" -print0 | xargs -0 -I{} sh -c 'cp --remove-destination $(realpath "{}") "{}"' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libunwind.so.1" "{}/libunwind.so" || true' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libc++.so.1" "{}/libc++.so" || true' -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libunwind-14-dev libunwind-14 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libunwind-14-dev libunwind-14 # End libc++ packages bugfix # Add armhf common files diff --git a/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh b/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh index 473b538..999b4e2 100755 --- a/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh @@ -16,12 +16,12 @@ 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:*" "libunwind-14:*" || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:ppc64el libc++abi-14-dev:ppc64el libc++1-14:ppc64el libunwind-14-dev:ppc64el libunwind-14:ppc64el +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:ppc64el libc++abi-14-dev:ppc64el libunwind-14-dev:ppc64el libunwind-14:ppc64el # shellcheck disable=SC2016 find /usr/lib/ -path "*-linux-*" -lname "*llvm*" -print0 | xargs -0 -I{} sh -c 'cp --remove-destination $(realpath "{}") "{}"' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libunwind.so.1" "{}/libunwind.so" || true' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libc++.so.1" "{}/libc++.so" || true' -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libunwind-14-dev libunwind-14 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libunwind-14-dev libunwind-14 # End libc++ packages bugfix # Add ppc64le common files diff --git a/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh b/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh index bb69d7e..94018db 100755 --- a/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh @@ -17,12 +17,12 @@ 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:*" "libunwind-14:*" || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:riscv64 libc++abi-14-dev:riscv64 libc++1-14:riscv64 libunwind-14-dev:riscv64 libunwind-14:riscv64 libatomic1:riscv64 libgcc-s1:riscv64 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:riscv64 libc++abi-14-dev:riscv64 libunwind-14-dev:riscv64 libunwind-14:riscv64 libatomic1:riscv64 libgcc-s1:riscv64 # shellcheck disable=SC2016 find /usr/lib/ -path "*-linux-*" -lname "*llvm*" -print0 | xargs -0 -I{} sh -c 'cp --remove-destination $(realpath "{}") "{}"' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libunwind.so.1" "{}/libunwind.so" || true' find /usr/lib/ -maxdepth 1 -path "*-linux-*" -type d -print0 | xargs -0 -I{} sh -c 'ln -s "{}/libc++.so.1" "{}/libc++.so" || true' -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libunwind-14-dev libunwind-14 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libunwind-14-dev libunwind-14 # End libc++ packages bugfix # Add riscv64 common files