Skip to content

Commit 8a670b2

Browse files
mreid-tthgy59
andauthored
Ensure valid custom toolchain name for qoriq-6.2.4 (powerpc-unknown-linux-gnuspe) (#6477)
* Fix invalid custom toolchain name * update custom rust for qoriq - add stable- prefix - remarks: 1.82.0 is the final version that can be built with qoriq-6.2.4 toolchain --------- Co-authored-by: hgy59 <hpgy59@gmail.com>
1 parent faf7826 commit 8a670b2

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

mk/spksrc.cross-rust-env.mk

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Configuration for rust compiler
22
#
33

4+
RUSTUP_QORIQ_TOOLCHAIN = 1.82.0
5+
46
ifeq ($(RUSTUP_DEFAULT_TOOLCHAIN),)
57
RUSTUP_DEFAULT_TOOLCHAIN = stable
68
endif
@@ -14,7 +16,7 @@ endif
1416

1517
# Versions available: https://releases.rs/docs/
1618
ifeq ($(RUST_BUILD_VERSION),)
17-
RUST_BUILD_VERSION = 1.82.0
19+
RUST_BUILD_VERSION = $(RUSTUP_QORIQ_TOOLCHAIN)
1820
endif
1921

2022
# Enforce using newer cmake when building Tier-3 toolchains
@@ -54,7 +56,7 @@ RUST_TARGET = aarch64-unknown-linux-gnu
5456
endif
5557
ifeq ($(findstring $(RUST_ARCH), $(PPC_ARCHS)),$(RUST_ARCH))
5658
RUST_TARGET = powerpc-unknown-linux-gnuspe
57-
TC_RUSTUP_TOOLCHAIN = $(RUST_BUILD_VERSION)-$(RUST_TARGET)
59+
TC_RUSTUP_TOOLCHAIN = stable-$(RUSTUP_QORIQ_TOOLCHAIN)-$(RUST_TARGET)
5860
endif
5961
ifeq ($(findstring $(RUST_ARCH), $(x64_ARCHS)),$(RUST_ARCH))
6062
RUST_TARGET = x86_64-unknown-linux-gnu

toolchain/syno-qoriq-6.2.4-rust/Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ PKG_ARCH = qoriq
22
PKG_NAME = rust-$(PKG_ARCH)
33
PKG_VERS = 1.82.0
44
PKG_EXT = txz
5-
PKG_DIST_TARGET = $(PKG_VERS)-powerpc-unknown-linux-gnuspe
5+
PKG_DIST_TARGET = stable-$(PKG_VERS)-powerpc-unknown-linux-gnuspe
66
PKG_DIST_NAME = $(PKG_DIST_TARGET).$(PKG_EXT)
77
PKG_DIST_SITE = https://github.com/SynoCommunity/spksrc/releases/download/rust/qoriq
88
EXTRACT_PATH = $(INSTALL_DIR)/$(INSTALL_PREFIX)
99

10-
DEPENDS =
10+
DEPENDS =
1111

1212
HOMEPAGE = https://www.rust-lang.org/
1313
COMMENT = A language empowering everyone to build reliable and efficient software.
14-
LICENSE = Apache-2.0, MIT licenses
14+
LICENSE = Apache-2.0, MIT licenses
1515

16-
# extracted directly into install folder
16+
# Extracted directly into install folder
1717
INSTALL_TARGET = nop
1818
POST_INSTALL_TARGET = rust-qoriq-postinstall
1919

@@ -28,5 +28,6 @@ rust-qoriq-postinstall:
2828
@export PATH="$(CARGO_PATH):$${PATH}" ; \
2929
export RUSTUP_HOME="$(RUSTUP_HOME)" ; \
3030
which rustup ; \
31+
rustup --version ; \
3132
rustup toolchain link $(PKG_DIST_TARGET) $(abspath $(INSTALL_DIR)/$(INSTALL_PREFIX)) ; \
3233
rustup show
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
1.82.0-powerpc-unknown-linux-gnuspe.txz SHA1 2bb6a24ca736640e0cb1c7f6fa147fe93029beab
2-
1.82.0-powerpc-unknown-linux-gnuspe.txz SHA256 52eff1c1e0615ea084a81afba1548d0e085170981f339f3cec77df3790bb5758
3-
1.82.0-powerpc-unknown-linux-gnuspe.txz MD5 9b60c0a6bbf803290c388840b767989c
1+
stable-1.82.0-powerpc-unknown-linux-gnuspe.txz SHA1 2f32d9100663bf26ddf3b193da5902a5b4a36642
2+
stable-1.82.0-powerpc-unknown-linux-gnuspe.txz SHA256 91ed5f963399a45150bfdca99cbbaa0dd03480d8350355678757885cbe5379a9
3+
stable-1.82.0-powerpc-unknown-linux-gnuspe.txz MD5 fb57d6ef3b16c9ca5f3aea0d4b2178b3

toolchain/syno-qoriq-6.2.4/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ TC_RUSTFLAGS = -C target-cpu=e500
1313

1414
include ../../mk/spksrc.tc.mk
1515

16-
OPTIONAL_DEPENDS = toolchain/syno-$(TC_ARCH)-$(TC_VERS)-rust
17-
1816
ifneq ($(RUST_BUILD_TOOLCHAIN),1)
1917
DEPENDS = toolchain/syno-$(TC_ARCH)-$(TC_VERS)-rust
2018
else

0 commit comments

Comments
 (0)