1
0
forked from ports/opt

rust: 1.67.0 -> 1.67.1

This commit is contained in:
Tim Biermann 2023-02-10 15:07:53 +01:00
parent dcaa21b2dc
commit 549c2a9d81
Signed by untrusted user: tb
GPG Key ID: 42F8B4E30B673606
3 changed files with 34 additions and 5 deletions

View File

@ -1,10 +1,11 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/QyKyIsfAQl9ub8bBsl78ZHMdteFr517uQpRwAGGt6cyIIsHX2ESanzZVwAzwMzSXIl2P6xeegHnzvGCUZM5FQQ=
SHA256 (Pkgfile) = db7c25a730a7f0bd677b9be9c512e78077999f2633d3294fb20505e6f3eed089
RWSE3ohX2g5d/WWK6uHc4e/uQXbI3EqPwu0u9iSEnDxeijSk3y/HccLt3oRhs2LlMmmuGJ0+T4rOfl8TfpcwppYJZYY8o9PR6Q8=
SHA256 (Pkgfile) = e9ffdef735730f19bc6b897ccde39625f830f426311318842c94af823df02345
SHA256 (.footprint) = 4fb2f872c27f431af5b049f6ea05f4e724491995ba323dd25730d68bc387fa7c
SHA256 (rustc-1.67.0-src.tar.xz) = 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d
SHA256 (rustc-1.67.1-src.tar.xz) = 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682
SHA256 (rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz) = c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377
SHA256 (rustc-1.66.1-x86_64-unknown-linux-gnu.tar.xz) = 242855e2626860aede6957dc56481cc02acf8cad12fa5bbbcbd93f9c51f0b3ad
SHA256 (cargo-1.66.1-x86_64-unknown-linux-gnu.tar.xz) = a636f83eb2327a66f484b9592ab305c6642df16fc80d0d1cb727e766a60da904
SHA256 (0001-bootstrap-Change-libexec-dir.patch) = 6a4e09671cd96a854cf0fc9a1f43651ac5a0fdc8dca571730131ae272b630cfe
SHA256 (0001-cargo-Change-libexec-dir.patch) = b2ef8c3bca5d72ed58ff8930e69947602f875a639c2b01de5943b1ecb1b5c3c3
SHA256 (0002-compiler-Change-LLVM-targets.patch) = 4a4ff5c294acc0b1ca800856218770f6330a878acee72193aa456d82846a8a28

View File

@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Thu, 6 May 2021 20:13:31 +0200
Subject: [PATCH] cargo: Change libexec dir
---
src/cargo/util/auth.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cargo/util/auth.rs b/src/cargo/util/auth.rs
index d67f874f132b..407da5a2538d 100644
--- a/src/cargo/util/auth.rs
+++ b/src/cargo/util/auth.rs
@@ -476,7 +476,7 @@ fn sysroot_credential(
.parent()
.and_then(|p| p.parent())
.ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?;
- let exe = root.join("libexec").join(format!(
+ let exe = root.join("lib").join(format!(
"cargo-credential-{}{}",
cred_name,
std::env::consts::EXE_SUFFIX

View File

@ -5,7 +5,7 @@
# Optional: ccache libgit2 lld polly sccache
name=rust
version=1.67.0
version=1.67.1
_date=2023-01-10
_rustc=1.66.1
_cargo=$_rustc
@ -16,6 +16,7 @@ source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-gnu.tar.xz
https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-gnu.tar.xz
0001-bootstrap-Change-libexec-dir.patch
0001-cargo-Change-libexec-dir.patch
0002-compiler-Change-LLVM-targets.patch)
unpack_source() {
@ -63,6 +64,7 @@ build() {
# Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec
patch -p1 -i $SRC/0001-bootstrap-Change-libexec-dir.patch
patch -d src/tools/cargo -Np1 -i $SRC/0001-cargo-Change-libexec-dir.patch
# Use our *-pc-linux-gnu targets, making LTO with clang simpler
patch -p1 -i $SRC/0002-compiler-Change-LLVM-targets.patch
@ -87,10 +89,13 @@ cat <<- EOF > $SRC/config.toml
codegen-units-std = 1
debuginfo-level-std = 2
codegen-tests = false
backtrace-on-ice = true
remap-debuginfo = true
jemalloc = true
description = "CRUX"
channel = "stable"
parallel-compiler = true
parallel-compiler = false
rpath = false
optimize = true
@LLD@
@ -103,6 +108,7 @@ cat <<- EOF > $SRC/config.toml
sanitizers = true
profiler = true
vendor = true
locked-deps = true
python = "/usr/bin/python3"
@CARGO@
@RUST@