diff --git a/packages/rust/build.sh b/packages/rust/build.sh index ea2c78cbef..ffa829aacc 100644 --- a/packages/rust/build.sh +++ b/packages/rust/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.rust-lang.org/ TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed and concurrency" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.70.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1.71.1 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz -TERMUX_PKG_SHA256=bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639 +TERMUX_PKG_SHA256=371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1 _LLVM_MAJOR_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo $LLVM_MAJOR_VERSION) _LLVM_MAJOR_VERSION_NEXT=$((_LLVM_MAJOR_VERSION + 1)) TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib, libllvm (<< $_LLVM_MAJOR_VERSION_NEXT)" @@ -73,7 +72,7 @@ termux_step_configure() { # like 30 to 40 + minutes ... so lets get it right # upstream only tests build ver one version behind $TERMUX_PKG_VERSION - local BOOTSTRAP_VERSION=1.69.0 + local BOOTSTRAP_VERSION=1.70.0 rustup install $BOOTSTRAP_VERSION rustup default $BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu export PATH=$HOME/.rustup/toolchains/$BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu/bin:$PATH @@ -124,7 +123,8 @@ termux_step_make_install() { $TERMUX_PKG_SRCDIR/x.py install --stage 1 --host $CARGO_TARGET_NAME --target $CARGO_TARGET_NAME $TERMUX_PKG_SRCDIR/x.py install --stage 1 std --target wasm32-unknown-unknown - $TERMUX_PKG_SRCDIR/x.py dist rustc-dev --host $CARGO_TARGET_NAME --target $CARGO_TARGET_NAME --target wasm32-unknown-unknown + $TERMUX_PKG_SRCDIR/x.py dist rustc-dev --host $CARGO_TARGET_NAME --target $CARGO_TARGET_NAME + $TERMUX_PKG_SRCDIR/x.py dist rustc-dev --host $CARGO_TARGET_NAME --target wasm32-unknown-unknown tar xvf build/dist/rustc-dev-$TERMUX_PKG_VERSION-$CARGO_TARGET_NAME.tar.gz ./rustc-dev-$TERMUX_PKG_VERSION-$CARGO_TARGET_NAME/install.sh --prefix=$TERMUX_PREFIX diff --git a/packages/rust/src-tools-rustc-workspace-hack-Cargo.toml.patch b/packages/rust/src-tools-rustc-workspace-hack-Cargo.toml.patch deleted file mode 100644 index 473a89ed31..0000000000 --- a/packages/rust/src-tools-rustc-workspace-hack-Cargo.toml.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/tools/rustc-workspace-hack/Cargo.toml -+++ b/src/tools/rustc-workspace-hack/Cargo.toml -@@ -85,6 +85,7 @@ - regex = { version = "1.5.6" } - serde_json = { version = "1.0.31", features = ["raw_value", "unbounded_depth"] } - syn = { version = "1", features = ['full', 'visit', 'visit-mut'] } # `visit-mut` required by Cargo via `gix` -+syn_2 = { version = "2", features = ['full'], package = "syn" } - url = { version = "2.0", features = ['serde'] } - # Ensure default features of rand, which are disabled in some scenarios. - rand = { version = "0.8.5" }