rust: Bump to 1.69.0
This commit is contained in:
parent
cc6686e03a
commit
e7300cea16
|
@ -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.68.2
|
||||
TERMUX_PKG_VERSION=1.69.0
|
||||
TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz
|
||||
TERMUX_PKG_SHA256=ce1a115f6aafa912b4622906a92b626354973afa9288e2c7750df4dcf3390fc0
|
||||
TERMUX_PKG_SHA256=e533c903820b0c2ba10491b70105149d2243348f3b5e26bd7b6bdd022c7dbe75
|
||||
_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)"
|
||||
|
@ -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.1
|
||||
local BOOTSTRAP_VERSION=1.68.2
|
||||
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
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
--- ./compiler/rustc_driver/src/lib.rs 2021-10-24 13:20:05.833987999 +0530
|
||||
+++ ./compiler/rustc_driver/src/lib.rs.mod 2021-10-24 13:21:43.523987961 +0530
|
||||
--- a/compiler/rustc_driver_impl/src/lib.rs
|
||||
+++ b/compiler/rustc_driver_impl/src/lib.rs
|
||||
@@ -1296,7 +1296,7 @@
|
||||
tracing::subscriber::set_global_default(subscriber).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
-#[cfg(all(unix, any(target_env = "gnu", target_os = "macos")))]
|
||||
|
|
|
@ -15,7 +15,7 @@ extended = true
|
|||
sanitizers = false
|
||||
|
||||
#tools = ["cargo", "analysis", "clippy-driver" ]
|
||||
tools = ["cargo", "rls", "clippy", "rustfmt", "analysis", "src"]
|
||||
tools = ["cargo", "rls", "clippy", "rustfmt", "analysis", "src", "rustdoc"]
|
||||
|
||||
[install]
|
||||
prefix = "@TERMUX_PREFIX@"
|
||||
|
@ -30,7 +30,7 @@ channel = "stable"
|
|||
rpath = false
|
||||
|
||||
[target.x86_64-unknown-linux-gnu]
|
||||
llvm-config = "/usr/bin/llvm-config-13"
|
||||
llvm-config = "/usr/bin/llvm-config-14"
|
||||
|
||||
[target.@triple@]
|
||||
android-ndk = "@TERMUX_STANDALONE_TOOLCHAIN@"
|
||||
|
|
|
@ -147,9 +147,9 @@ PACKAGES+=" composer"
|
|||
|
||||
# Needed by package rust.
|
||||
PACKAGES+=" libssl-dev" # Needed to build Rust
|
||||
PACKAGES+=" llvm-13-dev"
|
||||
PACKAGES+=" llvm-13-tools"
|
||||
PACKAGES+=" clang-13"
|
||||
PACKAGES+=" llvm-14-dev"
|
||||
PACKAGES+=" llvm-14-tools"
|
||||
PACKAGES+=" clang-14"
|
||||
|
||||
# Needed for package smalltalk.
|
||||
PACKAGES+=" libsigsegv-dev"
|
||||
|
|
Loading…
Reference in New Issue