From 1d84d630eaedee7edecb0b481396c2f1a5e15f3a Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Tue, 3 Jan 2023 08:56:54 -0500 Subject: [PATCH 1/2] add case for openwrt aarch64 in static deps fixes #2103 --- cmake/StaticBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 78e77a370..5f0ecf5c7 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -260,7 +260,7 @@ if(CMAKE_CROSSCOMPILING) set(openssl_arch linux-mips32) elseif(ARCH_TRIPLET STREQUAL mipsel-linux-gnu) set(openssl_arch linux-mips) - elseif(ARCH_TRIPLET STREQUAL aarch64-linux-gnu) + elseif(ARCH_TRIPLET STREQUAL aarch64-linux-gnu OR ARCH_TRIPLET STREQUAL aarch64-openwrt-linux-musl) # cross compile arm64 set(openssl_arch linux-aarch64) elseif(ARCH_TRIPLET MATCHES arm-linux) From dcd4623d2eeb2f04e3e9645fb17c2ae40451ad7b Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Tue, 3 Jan 2023 09:28:28 -0500 Subject: [PATCH 2/2] [win32 ci pipeline] bookworm has no need for alternatives for mingw. remove update-alternatives from the pipeline --- .drone.jsonnet | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d73d4193a..640645422 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -164,8 +164,6 @@ local windows_cross_pipeline(name, apt_get_quiet + ' update', apt_get_quiet + ' install -y eatmydata', 'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y build-essential cmake git pkg-config ccache g++-mingw-w64-x86-64-posix nsis zip icoutils automake libtool librsvg2-bin bison', - 'update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix', - 'update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix', 'JOBS=' + jobs + ' VERBOSE=1 ./contrib/windows.sh -DSTRIP_SYMBOLS=ON -DGUI_EXE=$${DRONE_WORKSPACE}/gui/release/Lokinet-GUI_portable.exe' + ci_dep_mirror(local_mirror), ] + extra_cmds,