From e23a0e5e2d34c9c628773bfa21efa56ad951f03c Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 19 Jun 2021 05:31:08 +0000 Subject: [PATCH 1/4] rust: update to 1.54.0 and enable host cross compiles Until target-applies-to-host is incorporated into stable this "target-applies-to-host" option is required for a matching host-target triple to be compiled by the cross compiler. Read more here: https://doc.rust-lang.org/cargo/reference/unstable.html#target-applies-to-host When rust-lang/cargo merges the following and it is released - then this "rust" package will need to be revisted if it is bumped. - Stabilize target-applies-to-host feature. #9753 The following are the rust-lang/cargo PRs that made this possible: - Configure hosts separately from targets when --target is specified. #9322 - Tracking Issue for target-applies-to-host #9453 --- .../librespot-depends/rust/package.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/librespot-depends/rust/package.mk b/packages/addons/addon-depends/librespot-depends/rust/package.mk index 34ddd50ee5..4e53c3a3ab 100644 --- a/packages/addons/addon-depends/librespot-depends/rust/package.mk +++ b/packages/addons/addon-depends/librespot-depends/rust/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rust" -PKG_VERSION="1.50.0" +PKG_VERSION="1.54.0" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" PKG_DEPENDS_TARGET="toolchain rustup.rs" @@ -25,11 +25,13 @@ make_target() { ;; esac "$(get_build_dir rustup.rs)/rustup-init.sh" \ - --default-toolchain "${PKG_VERSION}" \ + --default-toolchain none \ --no-modify-path \ --profile minimal \ --target "${RUST_TARGET_TRIPLE}" \ -y + cargo/bin/rustup toolchain install ${PKG_VERSION} --allow-downgrade --profile minimal --component clippy + cargo/bin/rustup target add ${RUST_TARGET_TRIPLE} cat <"${CARGO_HOME}/config" [build] @@ -43,6 +45,15 @@ EOF cat <"${CARGO_HOME}/env" export CARGO_HOME="${CARGO_HOME}" export CARGO_TARGET_DIR="\${PKG_BUILD}/.\${TARGET_NAME}" +if [ "${HOSTTYPE}" = "${TARGET_ARCH}" ]; then + # Until target-applies-to-host is incorporated into stable this + # option is required for a matching host-target triple to be compiled + # by the cross compiler. Read more here. + # https://doc.rust-lang.org/cargo/reference/unstable.html#target-applies-to-host + export __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" + export CARGO_TARGET_APPLIES_TO_HOST="false" + export CARGO_Z_TARGET_APPLIES_TO_HOST="-Z target-applies-to-host" +fi export PATH="${CARGO_HOME}/bin:${PATH}" export PKG_CONFIG_ALLOW_CROSS="1" export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}" From 94edf01cc7540020aaec256762838085f26d9e25 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 19 Jun 2021 09:22:15 +0000 Subject: [PATCH 2/4] bottom: fix build where TARGET=HOST with rust 1.54 --- .../addons/addon-depends/system-tools-depends/bottom/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/addon-depends/system-tools-depends/bottom/package.mk b/packages/addons/addon-depends/system-tools-depends/bottom/package.mk index 6c9c7d010a..67a5494887 100644 --- a/packages/addons/addon-depends/system-tools-depends/bottom/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/bottom/package.mk @@ -14,6 +14,7 @@ PKG_TOOLCHAIN="manual" make_target() { . "$(get_build_dir rust)/cargo/env" cargo build \ + ${CARGO_Z_TARGET_APPLIES_TO_HOST} \ --release \ --locked \ --all-features From 6e497d6a356c1fb30b98c0396510a128b3b469a6 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 19 Jun 2021 09:20:22 +0000 Subject: [PATCH 3/4] librespot: fix build where TARGET=HOST with rust 1.54 --- packages/addons/service/librespot/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk index 99fab58a50..67fa6a955a 100644 --- a/packages/addons/service/librespot/package.mk +++ b/packages/addons/service/librespot/package.mk @@ -25,6 +25,7 @@ PKG_MAINTAINER="Anton Voyl (awiouy)" make_target() { . $(get_build_dir rust)/cargo/env cargo build \ + ${CARGO_Z_TARGET_APPLIES_TO_HOST} \ --release \ --no-default-features \ --features "alsa-backend pulseaudio-backend with-dns-sd with-vorbis" From 79f2ce7c5cfdc2c60b39830d54505882105a5979 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 2 Aug 2021 23:58:55 +1000 Subject: [PATCH 4/4] system-tools: update to (124) --- packages/addons/tools/system-tools/changelog.txt | 3 +++ packages/addons/tools/system-tools/package.mk | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/addons/tools/system-tools/changelog.txt b/packages/addons/tools/system-tools/changelog.txt index 9a9beb3125..f850635e26 100644 --- a/packages/addons/tools/system-tools/changelog.txt +++ b/packages/addons/tools/system-tools/changelog.txt @@ -1,3 +1,6 @@ +124 +- Include bottom (btm) in Generic + 123 - Update stress-ng to 0.12.11 - Update unrar to 6.0.7 diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index 8487158a63..34b910d5ff 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="system-tools" PKG_VERSION="1.0" -PKG_REV="123" +PKG_REV="124" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" @@ -19,6 +19,7 @@ PKG_ADDON_TYPE="xbmc.python.script" PKG_DEPENDS_TARGET="toolchain \ autossh \ + bottom \ diffutils \ dstat \ dtach \ @@ -51,8 +52,6 @@ PKG_DEPENDS_TARGET="toolchain \ if [ "${TARGET_ARCH}" = "x86_64" ]; then PKG_DEPENDS_TARGET+=" efibootmgr st" -else - PKG_DEPENDS_TARGET+=" bottom" fi addon() {