archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-19 00:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/rust to 1.50.0-1

Browse source
This commit is contained in:
Kevin Mihelich 2021-02-11 23:32:01 +00:00
parent 19d87aa125
commit 26c29cf2de
2 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
extra/rust/PKGBUILD
View file

@ -16,10 +16,10 @@ highmem=1
pkgname=('rust' 'rust-docs') pkgname=('rust' 'rust-docs')
epoch=1 epoch=1
pkgver=1.49.0 pkgver=1.50.0
pkgrel=1 pkgrel=1
_llvm_ver=11.0.0 _llvm_ver=11.0.1
pkgdesc='Systems programming language focused on safety, speed and concurrency' pkgdesc='Systems programming language focused on safety, speed and concurrency'
url='https://www.rust-lang.org/' url='https://www.rust-lang.org/'
@ -32,13 +32,16 @@ checkdepends=('procps-ng' 'gdb')
options=('!emptydirs' '!strip') options=('!emptydirs' '!strip')
source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} source=(
"https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}) "https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
"https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}
sha256sums=('b50aefa8df1fdfc9bccafdbf37aee611c8dfe81bf5648d5f43699c50289dc779' libexec.diff
)
sha256sums=('95978f8d02bb6175ae3238930baf03563c240aedf9a70bebdc3eaa2a8c3c5a5e'
'SKIP' 'SKIP'
'374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234' '087be3f1116e861cd969c9b0b0903c27028b52eaf45157276f50a9c2500687fc'
'SKIP') 'SKIP'
'9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514')
validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com> '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com>
'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org> 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
@ -46,6 +49,9 @@ validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag a
prepare() { prepare() {
cd "rustc-$pkgver-src" cd "rustc-$pkgver-src"
# Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec
patch -Np1 -i ../libexec.diff
cat >config.toml <<END cat >config.toml <<END
[llvm] [llvm]
link-shared = true link-shared = true

24
extra/rust/libexec.diff Normal file
View file

@ -0,0 +1,24 @@
diff -u -r rustc-1.50.0-src/src/bootstrap/dist.rs rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs
--- rustc-1.50.0-src/src/bootstrap/dist.rs 2021-02-10 17:36:44.000000000 +0000
+++ rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs 2021-02-11 18:23:36.312495419 +0000
@@ -980,7 +980,7 @@
for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
let dirent = dirent.expect("read dir entry");
if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
- tarball.add_file(&dirent.path(), "libexec", 0o755);
+ tarball.add_file(&dirent.path(), "lib", 0o755);
}
}
diff -u -r rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs
--- rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs 2021-02-10 17:37:00.000000000 +0000
+++ rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs 2021-02-11 18:24:14.944321464 +0000
@@ -223,7 +223,7 @@
.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