From d9c015bc5b49432fe6404bd21c6db7ed9db96b15 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 14 May 2023 11:30:20 +0200 Subject: [PATCH] Fix parallel argument, dynamically fix llvm symlinks --- .github/workflows/scripts/build_api.sh | 4 ++-- .github/workflows/scripts/build_archlinux_amd64_ssl3.sh | 8 ++++---- .github/workflows/scripts/build_linux_386_ssl3.sh | 8 ++++---- .github/workflows/scripts/build_linux_amd64_ssl1.sh | 8 ++++---- .github/workflows/scripts/build_linux_amd64_ssl3.sh | 8 ++++---- .github/workflows/scripts/build_linux_arm64_ssl1.sh | 8 ++++---- .github/workflows/scripts/build_linux_arm64_ssl3.sh | 8 ++++---- .github/workflows/scripts/build_linux_armhf_ssl3.sh | 8 ++++---- .github/workflows/scripts/build_linux_ppc64le_ssl3.sh | 8 ++++---- .github/workflows/scripts/build_linux_riscv64_ssl3.sh | 8 ++++---- .github/workflows/scripts/build_macos_amd64.sh | 8 ++++---- .github/workflows/scripts/build_windows_amd64.sh | 8 ++++---- .github/workflows/scripts/install_deps_linux_386_ssl3.sh | 5 ++--- .../workflows/scripts/install_deps_linux_arm64_ssl1.sh | 5 ++--- .../workflows/scripts/install_deps_linux_arm64_ssl3.sh | 5 ++--- .../workflows/scripts/install_deps_linux_armhf_ssl3.sh | 5 ++--- .../workflows/scripts/install_deps_linux_ppc64le_ssl3.sh | 5 ++--- .../workflows/scripts/install_deps_linux_riscv64_ssl3.sh | 5 ++--- 18 files changed, 58 insertions(+), 64 deletions(-) diff --git a/.github/workflows/scripts/build_api.sh b/.github/workflows/scripts/build_api.sh index f44ed11..7cca3cf 100755 --- a/.github/workflows/scripts/build_api.sh +++ b/.github/workflows/scripts/build_api.sh @@ -17,8 +17,8 @@ cmake \ -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling --config Release "-j$(nproc)" -cmake --build . --target td_generate_java_api --config Release "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --config Release --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --config Release --parallel "$(nproc)" cd ../../../ # Generate TdApi.java diff --git a/.github/workflows/scripts/build_archlinux_amd64_ssl3.sh b/.github/workflows/scripts/build_archlinux_amd64_ssl3.sh index 746fe0d..7697e56 100755 --- a/.github/workflows/scripts/build_archlinux_amd64_ssl3.sh +++ b/.github/workflows/scripts/build_archlinux_amd64_ssl3.sh @@ -22,8 +22,8 @@ cmake \ -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -48,7 +48,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_PREFIX" \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -63,7 +63,7 @@ cmake \ -DJAVA_SRC_DIR="../src/main/java" \ -DTDNATIVES_CPP_SRC_DIR="../src/main/cpp" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_amd64_ssl3.so diff --git a/.github/workflows/scripts/build_linux_386_ssl3.sh b/.github/workflows/scripts/build_linux_386_ssl3.sh index 1e128f7..2b01422 100755 --- a/.github/workflows/scripts/build_linux_386_ssl3.sh +++ b/.github/workflows/scripts/build_linux_386_ssl3.sh @@ -43,8 +43,8 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -73,7 +73,7 @@ cmake \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -92,7 +92,7 @@ cmake \ -DTDNATIVES_CPP_SRC_DIR="$(readlink -e ../src/main/cpp)" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_386_ssl3.so diff --git a/.github/workflows/scripts/build_linux_amd64_ssl1.sh b/.github/workflows/scripts/build_linux_amd64_ssl1.sh index 6d1ef94..b52e02c 100755 --- a/.github/workflows/scripts/build_linux_amd64_ssl1.sh +++ b/.github/workflows/scripts/build_linux_amd64_ssl1.sh @@ -42,8 +42,8 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -77,7 +77,7 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_PREFIX" \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -100,7 +100,7 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DJAVA_SRC_DIR="$(readlink -e ../src/main/java)" \ -DTDNATIVES_CPP_SRC_DIR="$(readlink -e ../src/main/cpp)" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_amd64_ssl1.so diff --git a/.github/workflows/scripts/build_linux_amd64_ssl3.sh b/.github/workflows/scripts/build_linux_amd64_ssl3.sh index d126b83..745f0a3 100755 --- a/.github/workflows/scripts/build_linux_amd64_ssl3.sh +++ b/.github/workflows/scripts/build_linux_amd64_ssl3.sh @@ -42,8 +42,8 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -77,7 +77,7 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_PREFIX" \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -100,7 +100,7 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DJAVA_SRC_DIR="$(readlink -e ../src/main/java)" \ -DTDNATIVES_CPP_SRC_DIR="$(readlink -e ../src/main/cpp)" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_amd64_ssl3.so diff --git a/.github/workflows/scripts/build_linux_arm64_ssl1.sh b/.github/workflows/scripts/build_linux_arm64_ssl1.sh index faeec9d..6361360 100755 --- a/.github/workflows/scripts/build_linux_arm64_ssl1.sh +++ b/.github/workflows/scripts/build_linux_arm64_ssl1.sh @@ -43,8 +43,8 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -73,7 +73,7 @@ cmake \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -92,7 +92,7 @@ cmake \ -DTDNATIVES_CPP_SRC_DIR="$(readlink -e ../src/main/cpp)" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_arm64_ssl1.so diff --git a/.github/workflows/scripts/build_linux_arm64_ssl3.sh b/.github/workflows/scripts/build_linux_arm64_ssl3.sh index 56ebf28..42bb93c 100755 --- a/.github/workflows/scripts/build_linux_arm64_ssl3.sh +++ b/.github/workflows/scripts/build_linux_arm64_ssl3.sh @@ -43,8 +43,8 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -73,7 +73,7 @@ cmake \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -92,7 +92,7 @@ cmake \ -DTDNATIVES_CPP_SRC_DIR="$(readlink -e ../src/main/cpp)" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_arm64_ssl3.so diff --git a/.github/workflows/scripts/build_linux_armhf_ssl3.sh b/.github/workflows/scripts/build_linux_armhf_ssl3.sh index b84d651..8c23c2a 100755 --- a/.github/workflows/scripts/build_linux_armhf_ssl3.sh +++ b/.github/workflows/scripts/build_linux_armhf_ssl3.sh @@ -43,8 +43,8 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -73,7 +73,7 @@ cmake \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -92,7 +92,7 @@ cmake \ -DTDNATIVES_CPP_SRC_DIR="$(readlink -e ../src/main/cpp)" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_armhf_ssl3.so diff --git a/.github/workflows/scripts/build_linux_ppc64le_ssl3.sh b/.github/workflows/scripts/build_linux_ppc64le_ssl3.sh index a9970af..531703c 100755 --- a/.github/workflows/scripts/build_linux_ppc64le_ssl3.sh +++ b/.github/workflows/scripts/build_linux_ppc64le_ssl3.sh @@ -43,8 +43,8 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -73,7 +73,7 @@ cmake \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -92,7 +92,7 @@ cmake \ -DTDNATIVES_CPP_SRC_DIR="$(readlink -e ../src/main/cpp)" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_ppc64le_ssl3.so diff --git a/.github/workflows/scripts/build_linux_riscv64_ssl3.sh b/.github/workflows/scripts/build_linux_riscv64_ssl3.sh index 513923f..44a608e 100755 --- a/.github/workflows/scripts/build_linux_riscv64_ssl3.sh +++ b/.github/workflows/scripts/build_linux_riscv64_ssl3.sh @@ -43,8 +43,8 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -73,7 +73,7 @@ cmake \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -92,7 +92,7 @@ cmake \ -DTDNATIVES_CPP_SRC_DIR="$(readlink -e ../src/main/cpp)" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_riscv64_ssl3.so diff --git a/.github/workflows/scripts/build_macos_amd64.sh b/.github/workflows/scripts/build_macos_amd64.sh index 46af557..00bd531 100755 --- a/.github/workflows/scripts/build_macos_amd64.sh +++ b/.github/workflows/scripts/build_macos_amd64.sh @@ -28,8 +28,8 @@ cmake \ -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling "-j$(nproc)" -cmake --build . --target td_generate_java_api "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -59,7 +59,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_PREFIX" \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -77,7 +77,7 @@ cmake \ -DJAVA_SRC_DIR="$(greadlink -e ../src/main/java)" \ -DTDNATIVES_CPP_SRC_DIR="$(greadlink -e ../src/main/cpp)" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.dylib src/main/resources/META-INF/tdlightjni/libtdjni.linux_amd64_ssl3.dylib diff --git a/.github/workflows/scripts/build_windows_amd64.sh b/.github/workflows/scripts/build_windows_amd64.sh index 718a69a..126f701 100755 --- a/.github/workflows/scripts/build_windows_amd64.sh +++ b/.github/workflows/scripts/build_windows_amd64.sh @@ -31,8 +31,8 @@ cmake \ -DTD_ENABLE_LTO=OFF \ -DTD_ENABLE_JNI=ON \ .. -cmake --build . --target prepare_cross_compiling --config Release "-j$(nproc)" -cmake --build . --target td_generate_java_api --config Release "-j$(nproc)" +cmake --build . --target prepare_cross_compiling --config Release --parallel "$(nproc)" +cmake --build . --target td_generate_java_api --config Release --parallel "$(nproc)" cd ../../../ # Generate TdApi.java @@ -61,7 +61,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_PREFIX" \ -DCMAKE_INSTALL_BINDIR:PATH="$INSTALL_BINDIR" \ .. -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd ../../../ cd natives/build @@ -79,7 +79,7 @@ cmake \ -DJAVA_SRC_DIR="$(readlink -e ../src/main/java)" \ -DTDNATIVES_CPP_SRC_DIR="$(readlink -e ../src/main/cpp)" \ ../src/main/cpp -cmake --build . --target install --config Release "-j$(nproc)" +cmake --build . --target install --config Release --parallel "$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ mv tdjni_bin/libtdjni.dll src/main/resources/META-INF/tdlightjni/libtdjni.linux_amd64_ssl3.dll diff --git a/.github/workflows/scripts/install_deps_linux_386_ssl3.sh b/.github/workflows/scripts/install_deps_linux_386_ssl3.sh index 44a6e36..cd40da1 100755 --- a/.github/workflows/scripts/install_deps_linux_386_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_386_ssl3.sh @@ -11,9 +11,8 @@ 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 libc++abi1-14:i386 libunwind-14-dev:i386 libunwind-14:i386 -cp --remove-destination \ - /usr/lib/llvm-14/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ - /usr/lib/aarch64-linux-gnu/ || true +# shellcheck disable=SC2016 +find /usr/lib/i386-linux-gnu/ -lname "*llvm-14*" -print0 | xargs -0 -i sh -c 'cp --remove-destination $(readlink -e "{}") "{}" ' apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 # End libc++ packages bugfix diff --git a/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh index f4c6eb6..309851e 100755 --- a/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh +++ b/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh @@ -15,9 +15,8 @@ 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 libc++abi1-12:arm64 -cp --remove-destination \ - /usr/lib/llvm-12/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0} \ - /usr/lib/aarch64-linux-gnu/ || true +# shellcheck disable=SC2016 +find /usr/lib/aarch64-linux-gnu/ -lname "*llvm-12*" -print0 | xargs -0 -i sh -c 'cp --remove-destination $(readlink -e "{}") "{}" ' apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-12 libc++-12-dev libc++abi-12-dev libc++1-12 libc++abi1-12 # End libc++ packages bugfix diff --git a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh index 4952d0a..05d36b5 100755 --- a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh @@ -15,9 +15,8 @@ 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 libc++abi1-14:arm64 libunwind-14-dev:arm64 libunwind-14:arm64 -cp --remove-destination \ - /usr/lib/llvm-14/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ - /usr/lib/aarch64-linux-gnu/ || true +# shellcheck disable=SC2016 +find /usr/lib/aarch64-linux-gnu/ -lname "*llvm-14*" -print0 | xargs -0 -i sh -c 'cp --remove-destination $(readlink -e "{}") "{}" ' apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 # End libc++ packages bugfix diff --git a/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh b/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh index 8abc21b..cf0ced9 100755 --- a/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh @@ -15,9 +15,8 @@ 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 libc++abi1-14:armhf libunwind-14-dev:armhf libunwind-14:armhf -cp --remove-destination \ - /usr/lib/llvm-14/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ - /usr/lib/aarch64-linux-gnu/ || true +# shellcheck disable=SC2016 +find /usr/lib/armhf-linux-gnu/ -lname "*llvm-14*" -print0 | xargs -0 -i sh -c 'cp --remove-destination $(readlink -e "{}") "{}" ' apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 # End libc++ packages bugfix diff --git a/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh b/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh index cbee242..fc3f0c6 100755 --- a/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh @@ -15,9 +15,8 @@ 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 libc++abi1-14:ppc64el libunwind-14-dev:ppc64el libunwind-14:ppc64el -cp --remove-destination \ - /usr/lib/llvm-14/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ - /usr/lib/aarch64-linux-gnu/ || true +# shellcheck disable=SC2016 +find /usr/lib/ppc64el-linux-gnu/ -lname "*llvm-14*" -print0 | xargs -0 -i sh -c 'cp --remove-destination $(readlink -e "{}") "{}" ' apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 # End libc++ packages bugfix diff --git a/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh b/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh index 21942fe..3a149fd 100755 --- a/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh @@ -15,9 +15,8 @@ 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 libc++abi1-14:riscv64 libunwind-14-dev:riscv64 libunwind-14:riscv64 -cp --remove-destination \ - /usr/lib/llvm-14/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ - /usr/lib/aarch64-linux-gnu/ || true +# shellcheck disable=SC2016 +find /usr/lib/riscv64-linux-gnu/ -lname "*llvm-14*" -print0 | xargs -0 -i sh -c 'cp --remove-destination $(readlink -e "{}") "{}" ' apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 # End libc++ packages bugfix