rust: Update to 1.58.1

Co-authored-by: sk0kanik <37567788+sk0kanik@users.noreply.github.com>
This commit is contained in:
Tee KOBAYASHI 2022-01-29 21:24:02 +09:00 committed by xtkoba
parent 907319a383
commit e1e7edb8b9
3 changed files with 9 additions and 8 deletions

View File

@ -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.57.0
TERMUX_PKG_VERSION=1.58.1
TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz
TERMUX_PKG_SHA256=fad07ea1daf9c6195c32e6e9c43ece4565c5f2f1de3c3771574790d6abbc9704
TERMUX_PKG_SHA256=2b3643a48e7087053b0268971ec4154350342508922a8acb0707aaf94deb4469
TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib, libllvm"
TERMUX_PKG_RM_AFTER_INSTALL="bin/llvm-dwp"
@ -19,7 +19,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.56.1
local BOOTSTRAP_VERSION=1.57.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

View File

@ -30,7 +30,7 @@ channel = "stable"
rpath = false
[target.x86_64-unknown-linux-gnu]
llvm-config = "/usr/bin/llvm-config-10"
llvm-config = "/usr/bin/llvm-config-12"
[target.@triple@]
android-ndk = "@TERMUX_STANDALONE_TOOLCHAIN@"

View File

@ -1,8 +1,9 @@
--- ../rustc-1.29.2-src/src/libstd/sys/unix/os.rs 2018-10-19 14:12:31.000000000 -0700
+++ ./library/std/src/sys/unix/os.rs 2018-10-19 14:11:20.000000000 -0700
@@ -488,7 +488,7 @@
diff -uNr rustc-1.57.0-src/library/std/src/sys/unix/os.rs rustc-1.57.0-src.mod/library/std/src/sys/unix/os.rs
--- rustc-1.57.0-src/library/std/src/sys/unix/os.rs 2021-11-29 20:27:11.000000000 +0100
+++ rustc-1.57.0-src.mod/library/std/src/sys/unix/os.rs 2021-12-04 09:04:53.000000000 +0100
@@ -570,7 +570,7 @@
pub fn temp_dir() -> PathBuf {
::env::var_os("TMPDIR").map(PathBuf::from).unwrap_or_else(|| {
crate::env::var_os("TMPDIR").map(PathBuf::from).unwrap_or_else(|| {
if cfg!(target_os = "android") {
- PathBuf::from("/data/local/tmp")
+ PathBuf::from("@TERMUX_PREFIX@/tmp")