Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update rust resolving TARGET=HOST build issues #5446

Merged
merged 4 commits into from
Aug 3, 2021
Merged

Update rust resolving TARGET=HOST build issues #5446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e23a0e5
rust: update to 1.54.0 and enable host cross compiles
heitbaum Jun 19, 2021
94edf01
bottom: fix build where TARGET=HOST with rust 1.54
heitbaum Jun 19, 2021
6e497d6
librespot: fix build where TARGET=HOST with rust 1.54
heitbaum Jun 19, 2021
79f2ce7
system-tools: update to (124)
heitbaum Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions packages/addons/addon-depends/librespot-depends/rust/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]
Expand All @@ -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}"
Expand Down
1 change: 1 addition & 0 deletions packages/addons/addon-depends/system-tools-depends/bottom/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions packages/addons/service/librespot/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions packages/addons/tools/system-tools/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
124
- Include bottom (btm) in Generic

123
- Update stress-ng to 0.12.11
- Update unrar to 6.0.7
Expand Down
5 changes: 2 additions & 3 deletions packages/addons/tools/system-tools/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -19,6 +19,7 @@ PKG_ADDON_TYPE="xbmc.python.script"

PKG_DEPENDS_TARGET="toolchain \
autossh \
bottom \
diffutils \
dstat \
dtach \
Expand Down Expand Up @@ -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() {
Expand Down