mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-27 23:44:04 +00:00
extra/rust to 1.39.0-1
This commit is contained in:
Kevin Mihelich
parent
7316c209a5
commit
b909f38154
3 changed files with 26 additions and 51 deletions
|
|
@ -1,17 +1,17 @@
|
|||
From 2bf05f208272cd58c57f4d7d8d0e10fdb22e8719 Mon Sep 17 00:00:00 2001
|
||||
From 14948e9d7bdb5cc7e975c1f3435692eeb748f07b Mon Sep 17 00:00:00 2001
|
||||
From: Josh Stone <jistone@redhat.com>
|
||||
Date: Fri, 27 Sep 2019 12:33:08 -0700
|
||||
Subject: [PATCH] [WIP] minimize the rust-std component
|
||||
|
||||
---
|
||||
src/bootstrap/dist.rs | 45 +++++++++++++++----------------------------
|
||||
1 file changed, 16 insertions(+), 29 deletions(-)
|
||||
src/bootstrap/dist.rs | 33 +++++++++------------------------
|
||||
1 file changed, 9 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
|
||||
index 552965863d10..76fbd07f9fb5 100644
|
||||
index d9dff77a30e..bd96a6371fc 100644
|
||||
--- a/src/bootstrap/dist.rs
|
||||
+++ b/src/bootstrap/dist.rs
|
||||
@@ -667,41 +667,28 @@ impl Step for Std {
|
||||
@@ -675,36 +675,21 @@ impl Step for Std {
|
||||
return distdir(builder).join(format!("{}-{}.tar.gz", name, target));
|
||||
}
|
||||
|
||||
|
|
@ -21,15 +21,9 @@ index 552965863d10..76fbd07f9fb5 100644
|
|||
- if builder.hosts.iter().any(|t| t == target) {
|
||||
- builder.ensure(compile::Rustc { compiler, target });
|
||||
- } else {
|
||||
- if builder.no_std(target) == Some(true) {
|
||||
- // the `test` doesn't compile for no-std targets
|
||||
- builder.ensure(compile::Std { compiler, target });
|
||||
- } else {
|
||||
- builder.ensure(compile::Test { compiler, target });
|
||||
- }
|
||||
- builder.ensure(compile::Std { compiler, target });
|
||||
- }
|
||||
+ builder.ensure(compile::Std { compiler, target });
|
||||
+ builder.ensure(compile::Test { compiler, target });
|
||||
|
||||
let image = tmpdir(builder).join(format!("{}-{}-image", name, target));
|
||||
let _ = fs::remove_dir_all(&image);
|
||||
|
|
@ -59,16 +53,10 @@ index 552965863d10..76fbd07f9fb5 100644
|
|||
}
|
||||
- true
|
||||
- });
|
||||
+ }
|
||||
+ let stamp = dbg!(compile::libtest_stamp(builder, compiler_to_use, target));
|
||||
+ for (path, host) in builder.read_stamp_file(&stamp) {
|
||||
+ if !host {
|
||||
+ builder.copy(&path, &dst.join(path.file_name().unwrap()));
|
||||
+ }
|
||||
+ }
|
||||
|
||||
let mut cmd = rust_installer(builder);
|
||||
cmd.arg("generate")
|
||||
--
|
||||
2.21.0
|
||||
2.24.0
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ highmem=1
|
|||
|
||||
pkgname=('rust' 'rust-docs')
|
||||
epoch=1
|
||||
pkgver=1.38.0
|
||||
pkgrel=2
|
||||
pkgver=1.39.0
|
||||
pkgrel=1
|
||||
|
||||
_llvm_ver=9.0.0
|
||||
|
||||
|
|
@ -32,15 +32,13 @@ options=('!emptydirs')
|
|||
|
||||
source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
|
||||
"http://releases.llvm.org/$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}
|
||||
bootstrap-1.38.patch
|
||||
0001-WIP-minimize-the-rust-std-component.patch)
|
||||
|
||||
sha256sums=('644263ca7c7106f8ee8fcde6bb16910d246b30668a74be20b8c7e0e9f4a52d80'
|
||||
sha256sums=('b4a1f6b6a93931f270691aba4fc85eee032fecda973e6b9c774cd06857609357'
|
||||
'SKIP'
|
||||
'56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e'
|
||||
'SKIP'
|
||||
'71935e8994d1045680cde22f72a12c4959e1877e5a42fc21fd034d677100dab3'
|
||||
'1d6b69444ef6ff033fe1612e56ecdaad5c52aa44395e704f78b1a047c65b9321')
|
||||
'9e64e6abe9b118ee496c317ef37f4b500b54ecd69e9c02cad2a6a0b7235e9afd')
|
||||
validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
|
||||
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com>
|
||||
'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
|
||||
|
|
@ -48,9 +46,6 @@ validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag a
|
|||
prepare() {
|
||||
cd "rustc-$pkgver-src"
|
||||
|
||||
# Fix bootstrap to compile with 1.38
|
||||
patch -Np1 -i ../bootstrap-1.38.patch
|
||||
|
||||
# For https://bugzilla.redhat.com/show_bug.cgi?id=1756487
|
||||
# From https://src.fedoraproject.org/rpms/rust/tree/master
|
||||
patch -Np1 -i ../0001-WIP-minimize-the-rust-std-component.patch
|
||||
|
|
@ -107,7 +102,18 @@ END
|
|||
fi
|
||||
}
|
||||
|
||||
# Don't call build — install will duplicate a lot of work and --keep-stage is not enough
|
||||
build() {
|
||||
cd "rustc-$pkgver-src"
|
||||
|
||||
export RUST_BACKTRACE=1
|
||||
export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
|
||||
|
||||
python ./x.py dist $jobs
|
||||
DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)"
|
||||
|
||||
# move docs out of the way for splitting
|
||||
mv dest-rust/usr/share/doc dest-doc
|
||||
}
|
||||
|
||||
package_rust() {
|
||||
depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
|
||||
|
|
@ -117,11 +123,7 @@ package_rust() {
|
|||
|
||||
cd "rustc-$pkgver-src"
|
||||
|
||||
export RUST_BACKTRACE=1
|
||||
export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
|
||||
|
||||
DESTDIR="$pkgdir" python ./x.py install $jobs
|
||||
|
||||
mv dest-rust/* "$pkgdir"
|
||||
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
|
||||
|
||||
# delete unnecesary files, e.g. components and manifest files only used for the uninstall script
|
||||
|
|
@ -132,9 +134,6 @@ package_rust() {
|
|||
# overwrite them with symlinks to the per-architecture versions
|
||||
ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so
|
||||
|
||||
# move docs out of the way for splitting
|
||||
mv "$pkgdir"/usr/share/doc "$srcdir"
|
||||
|
||||
install -d "$pkgdir"/usr/share/bash-completion
|
||||
mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/
|
||||
}
|
||||
|
|
@ -145,7 +144,8 @@ package_rust-docs() {
|
|||
cd "rustc-$pkgver-src"
|
||||
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
|
||||
|
||||
mv "$srcdir"/doc "$pkgdir"/usr/share/doc
|
||||
install -d "$pkgdir"/usr/share/doc
|
||||
mv dest-doc/* "$pkgdir"/usr/share/doc
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
|
||||
index e54c9360baec..9e4cd5ebca74 100644
|
||||
--- a/src/bootstrap/builder.rs
|
||||
+++ b/src/bootstrap/builder.rs
|
||||
@@ -145,7 +145,7 @@ impl StepDescription {
|
||||
only_hosts: S::ONLY_HOSTS,
|
||||
should_run: S::should_run,
|
||||
make_run: S::make_run,
|
||||
- name: unsafe { ::std::intrinsics::type_name::<S>() },
|
||||
+ name: std::any::type_name::<S>(),
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in a new issue