jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 07:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

rust: update to 1.54.0 and enable host cross compiles

Browse Source 
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
This commit is contained in:
heitbaum 2021-06-19 05:31:08 +00:00
parent 6175dba8e4
commit e23a0e5e2d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/addons/addon-depends/librespot-depends/rust/package.mk
View File

@ -2,7 +2,7 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="rust" PKG_NAME="rust"
PKG_VERSION="1.50.0" PKG_VERSION="1.54.0"
PKG_LICENSE="MIT" PKG_LICENSE="MIT"
PKG_SITE="https://www.rust-lang.org" PKG_SITE="https://www.rust-lang.org"
PKG_DEPENDS_TARGET="toolchain rustup.rs" PKG_DEPENDS_TARGET="toolchain rustup.rs"
@ -25,11 +25,13 @@ make_target() {
;; ;;
esac esac
"$(get_build_dir rustup.rs)/rustup-init.sh" \ "$(get_build_dir rustup.rs)/rustup-init.sh" \
--default-toolchain "${PKG_VERSION}" \ --default-toolchain none \
--no-modify-path \ --no-modify-path \
--profile minimal \ --profile minimal \
--target "${RUST_TARGET_TRIPLE}" \ --target "${RUST_TARGET_TRIPLE}" \
-y -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" cat <<EOF >"${CARGO_HOME}/config"
[build] [build]
@ -43,6 +45,15 @@ EOF
cat <<EOF >"${CARGO_HOME}/env" cat <<EOF >"${CARGO_HOME}/env"
export CARGO_HOME="${CARGO_HOME}" export CARGO_HOME="${CARGO_HOME}"
export CARGO_TARGET_DIR="\${PKG_BUILD}/.\${TARGET_NAME}" 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 PATH="${CARGO_HOME}/bin:${PATH}"
export PKG_CONFIG_ALLOW_CROSS="1" export PKG_CONFIG_ALLOW_CROSS="1"
export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}" export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}"