From eb7c65e77b60da6544e2f4c1bbf3ba06705ef1b7 Mon Sep 17 00:00:00 2001 From: Dariusz Olszewski <8277636+starypatyk@users.noreply.github.com> Date: Mon, 22 Sep 2025 20:09:36 +0200 Subject: [PATCH] Fix cross compilation (add required TLS backend selection) (#1594) --- contrib/Dockerfile | 8 ++++---- contrib/cross-compile-armv6hf/docker-build.sh | 2 +- contrib/docker-build.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/Dockerfile b/contrib/Dockerfile index cae7a6d7..9b3a5a81 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -8,10 +8,10 @@ # The compiled binaries will be located in /tmp/librespot-build # # If only one architecture is desired, cargo can be invoked directly with the appropriate options : -# $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --no-default-features --features "alsa-backend with-libmdns" -# $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target arm-unknown-linux-gnueabihf --no-default-features --features "alsa-backend with-libmdns" -# $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target arm-unknown-linux-gnueabi --no-default-features --features "alsa-backend with-libmdns" -# $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target aarch64-unknown-linux-gnu --no-default-features --features "alsa-backend with-libmdns" +# $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --no-default-features --features "alsa-backend with-libmdns rustls-tls-native-roots" +# $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target arm-unknown-linux-gnueabihf --no-default-features --features "alsa-backend with-libmdns rustls-tls-native-roots" +# $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target arm-unknown-linux-gnueabi --no-default-features --features "alsa-backend with-libmdns rustls-tls-native-roots" +# $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target aarch64-unknown-linux-gnu --no-default-features --features "alsa-backend with-libmdns rustls-tls-native-roots" FROM debian:bookworm diff --git a/contrib/cross-compile-armv6hf/docker-build.sh b/contrib/cross-compile-armv6hf/docker-build.sh index 76158e44..08386186 100755 --- a/contrib/cross-compile-armv6hf/docker-build.sh +++ b/contrib/cross-compile-armv6hf/docker-build.sh @@ -14,4 +14,4 @@ PI1_LIB_DIRS=( export RUSTFLAGS="-C linker=$PI1_TOOLS_DIR/bin/arm-linux-gnueabihf-gcc ${PI1_LIB_DIRS[*]/#/-L}" export BINDGEN_EXTRA_CLANG_ARGS=--sysroot=$PI1_TOOLS_SYSROOT_DIR -cargo build --release --target arm-unknown-linux-gnueabihf --no-default-features --features "alsa-backend with-libmdns" +cargo build --release --target arm-unknown-linux-gnueabihf --no-default-features --features "alsa-backend with-libmdns rustls-tls-native-roots" diff --git a/contrib/docker-build.sh b/contrib/docker-build.sh index 50b6b3e1..84131e07 100755 --- a/contrib/docker-build.sh +++ b/contrib/docker-build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -eux -cargo build --release --no-default-features --features "alsa-backend with-libmdns" -cargo build --release --target aarch64-unknown-linux-gnu --no-default-features --features "alsa-backend with-libmdns" -cargo build --release --target arm-unknown-linux-gnueabihf --no-default-features --features "alsa-backend with-libmdns" -cargo build --release --target arm-unknown-linux-gnueabi --no-default-features --features "alsa-backend with-libmdns" +cargo build --release --no-default-features --features "alsa-backend with-libmdns rustls-tls-native-roots" +cargo build --release --target aarch64-unknown-linux-gnu --no-default-features --features "alsa-backend with-libmdns rustls-tls-native-roots" +cargo build --release --target arm-unknown-linux-gnueabihf --no-default-features --features "alsa-backend with-libmdns rustls-tls-native-roots" +cargo build --release --target arm-unknown-linux-gnueabi --no-default-features --features "alsa-backend with-libmdns rustls-tls-native-roots"