From 4c114a77162886666c122638e20692a947898869 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Mon, 8 May 2023 20:54:09 +0200 Subject: [PATCH] fix --- .github/workflows/scripts/build-linux-amd64-ssl1.sh | 2 +- .github/workflows/scripts/build-linux-amd64-ssl3.sh | 2 +- .github/workflows/scripts/build-linux-arm64-ssl1.sh | 2 +- .github/workflows/scripts/install-deps-linux-arm64-ssl1.sh | 5 +++++ implementations/tdlight | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scripts/build-linux-amd64-ssl1.sh b/.github/workflows/scripts/build-linux-amd64-ssl1.sh index 7849e45..eb25f0b 100755 --- a/.github/workflows/scripts/build-linux-amd64-ssl1.sh +++ b/.github/workflows/scripts/build-linux-amd64-ssl1.sh @@ -11,7 +11,7 @@ HOST_CMAKE_C_COMPILER="/usr/bin/clang-10" HOST_CMAKE_CXX_COMPILER="/usr/bin/clang++-10" HOST_CMAKE_C_FLAGS="-fuse-ld=lld" HOST_CMAKE_CXX_FLAGS="${HOST_CMAKE_C_FLAGS} -stdlib=libc++" -HOST_CMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind" +HOST_CMAKE_EXE_LINKER_FLAGS="-lc++ -lc++abi -fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind" # Build tdlib tools cd implementations/tdlight/td_tools_build diff --git a/.github/workflows/scripts/build-linux-amd64-ssl3.sh b/.github/workflows/scripts/build-linux-amd64-ssl3.sh index 1bae776..85c65a0 100755 --- a/.github/workflows/scripts/build-linux-amd64-ssl3.sh +++ b/.github/workflows/scripts/build-linux-amd64-ssl3.sh @@ -11,7 +11,7 @@ HOST_CMAKE_C_COMPILER="/usr/bin/clang-14" HOST_CMAKE_CXX_COMPILER="/usr/bin/clang++-14" HOST_CMAKE_C_FLAGS="-fuse-ld=lld" HOST_CMAKE_CXX_FLAGS="${HOST_CMAKE_C_FLAGS} -stdlib=libc++" -HOST_CMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind" +HOST_CMAKE_EXE_LINKER_FLAGS="-lc++ -lc++abi -fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind" # Build tdlib tools cd implementations/tdlight/td_tools_build diff --git a/.github/workflows/scripts/build-linux-arm64-ssl1.sh b/.github/workflows/scripts/build-linux-arm64-ssl1.sh index f9ee5b3..8a8c422 100755 --- a/.github/workflows/scripts/build-linux-arm64-ssl1.sh +++ b/.github/workflows/scripts/build-linux-arm64-ssl1.sh @@ -12,7 +12,7 @@ HOST_CMAKE_C_COMPILER="/usr/bin/clang-10" HOST_CMAKE_CXX_COMPILER="/usr/bin/clang++-10" HOST_CMAKE_C_FLAGS="-fuse-ld=lld" HOST_CMAKE_CXX_FLAGS="${HOST_CMAKE_C_FLAGS} -stdlib=libc++" -HOST_CMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind" +HOST_CMAKE_EXE_LINKER_FLAGS="-lc++ -lc++abi -fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind" # Build tdlib tools cd implementations/tdlight/td_tools_build diff --git a/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh b/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh index 5629f74..723d824 100755 --- a/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh +++ b/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh @@ -21,5 +21,10 @@ mv /usr/lib/llvm-10/lib/libc++abi.so /usr/lib/aarch64-linux-gnu/ apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-10-dev libc++abi-10-dev # End libc++ packages bugfix +# Add arm64 common files +apt-get download libclang-common-10-dev:arm64 +dpkg-deb -xv libclang-common-10-dev_*_arm64.deb / + + # Install dependencies apt-get --assume-yes install libssl-dev:arm64 zlib1g-dev:arm64 openjdk-8-jdk-headless:arm64 libgcc-9-dev:arm64 libc6-dev:arm64 diff --git a/implementations/tdlight b/implementations/tdlight index 9c805dc..9410519 160000 --- a/implementations/tdlight +++ b/implementations/tdlight @@ -1 +1 @@ -Subproject commit 9c805dc438a3611023aa0fb709746d4f70169539 +Subproject commit 941051933e07d2f9bec679d515d4cb3083a17482