From e933cf2223b3544656d699bc0c7f018f4430eb5f Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Thu, 11 May 2023 17:27:14 +0200 Subject: [PATCH] Fix deps --- .../workflows/scripts/install_deps_linux_arm64_ssl1.sh | 7 ++++--- .../workflows/scripts/install_deps_linux_arm64_ssl3.sh | 10 ++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh index 533f98c..25badd9 100755 --- a/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh +++ b/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh @@ -5,9 +5,10 @@ export DEBIAN_FRONTEND=noninteractive dpkg --add-architecture arm64 sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list -echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse" >> /etc/apt/sources.list -echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse" >> /etc/apt/sources.list -echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-security main universe restricted multiverse" >> /etc/apt/sources.list +echo "# tdlight multiarch" > /etc/apt/sources.list.d/tdlight-multiarch.list +echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list +echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list +echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-security main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list apt-get --assume-yes update diff --git a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh index e30f72d..c983034 100755 --- a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh @@ -5,19 +5,21 @@ export DEBIAN_FRONTEND=noninteractive dpkg --add-architecture arm64 sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list -echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse" >> /etc/apt/sources.list -echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse" >> /etc/apt/sources.list -echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-security main universe restricted multiverse" >> /etc/apt/sources.list +echo "# tdlight multiarch" > /etc/apt/sources.list.d/tdlight-multiarch.list +echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list +echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list +echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-security main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list 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 || true apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:arm64 libc++abi-14-dev:arm64 -rm -r /usr/lib/aarch64-linux-gnu/libc++.so.1.0 /usr/lib/aarch64-linux-gnu/libc++abi.so.1.0 /usr/lib/aarch64-linux-gnu/libc++abi.so +rm -r /usr/lib/aarch64-linux-gnu/libc++.so.1.0 /usr/lib/aarch64-linux-gnu/libc++abi.so.1.0 /usr/lib/aarch64-linux-gnu/libc++abi.so /usr/lib/aarch64-linux-gnu/libunwind.so.1.0 mv /usr/lib/llvm-14/lib/libc++.so.1.0 /usr/lib/aarch64-linux-gnu/ mv /usr/lib/llvm-14/lib/libc++abi.so.1.0 /usr/lib/aarch64-linux-gnu/ mv /usr/lib/llvm-14/lib/libc++abi.so /usr/lib/aarch64-linux-gnu/ +mv /usr/lib/llvm-14/lib/libunwind.so.1.0 /usr/lib/aarch64-linux-gnu/ apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev libc++abi-14-dev # End libc++ packages bugfix