Skip to content

Commit

Permalink
rust: Bump to 1.70.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xtkoba committed Jun 3, 2023
1 parent c02cb84 commit 6e28b14
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/rust/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +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.69.0
TERMUX_PKG_VERSION=1.70.0
TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz
TERMUX_PKG_SHA256=e533c903820b0c2ba10491b70105149d2243348f3b5e26bd7b6bdd022c7dbe75
TERMUX_PKG_SHA256=bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639
_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)"
Expand Down Expand Up @@ -72,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.68.2
local BOOTSTRAP_VERSION=1.69.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
Expand Down
10 changes: 10 additions & 0 deletions packages/rust/src-tools-rustc-workspace-hack-Cargo.toml.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- 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" }

0 comments on commit 6e28b14

Please sign in to comment.