Merge pull request #5446 from heitbaum/fixrust

Update rust resolving TARGET=HOST build issues

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 <<EOF >"${CARGO_HOME}/config"
 [build]
@@ -43,6 +45,15 @@ EOF
   cat <<EOF >"${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}"

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

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"

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

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() {