From a8fa599bedb8f2f3d8c0f90c43b8b3795b161c4b Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 3 Oct 2019 12:56:17 +0000 Subject: [PATCH] extra/rust to 1.38.0-1 --- ...-WIP-minimize-the-rust-std-component.patch | 74 +++++++++++++++++++ extra/rust/PKGBUILD | 35 +++++---- extra/rust/config.toml | 8 +- 3 files changed, 101 insertions(+), 16 deletions(-) create mode 100644 extra/rust/0001-WIP-minimize-the-rust-std-component.patch diff --git a/extra/rust/0001-WIP-minimize-the-rust-std-component.patch b/extra/rust/0001-WIP-minimize-the-rust-std-component.patch new file mode 100644 index 000000000..04be717a3 --- /dev/null +++ b/extra/rust/0001-WIP-minimize-the-rust-std-component.patch @@ -0,0 +1,74 @@ +From 2bf05f208272cd58c57f4d7d8d0e10fdb22e8719 Mon Sep 17 00:00:00 2001 +From: Josh Stone +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(-) + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index 552965863d10..76fbd07f9fb5 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -667,41 +667,28 @@ impl Step for Std { + return distdir(builder).join(format!("{}-{}.tar.gz", name, target)); + } + +- // We want to package up as many target libraries as possible +- // for the `rust-std` package, so if this is a host target we +- // depend on librustc and otherwise we just depend on libtest. +- 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::Test { compiler, target }); + + let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); + let _ = fs::remove_dir_all(&image); + +- let dst = image.join("lib/rustlib").join(target); ++ let dst = image.join("lib/rustlib").join(target).join("lib"); + t!(fs::create_dir_all(&dst)); +- let mut src = builder.sysroot_libdir(compiler, target).to_path_buf(); +- src.pop(); // Remove the trailing /lib folder from the sysroot_libdir +- builder.cp_filtered(&src, &dst, &|path| { +- if let Some(name) = path.file_name().and_then(|s| s.to_str()) { +- if name == builder.config.rust_codegen_backends_dir.as_str() { +- return false +- } +- if name == "bin" { +- return false +- } +- if name.contains("LLVM") { +- return false +- } ++ ++ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target); ++ let stamp = dbg!(compile::libstd_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())); + } +- 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 + diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index 861ca9fba..a2c6c41f1 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -16,8 +16,8 @@ highmem=1 pkgname=('rust' 'rust-docs') epoch=1 -pkgver=1.37.0 -pkgrel=2 +pkgver=1.38.0 +pkgrel=1 _llvm_ver=8.0.1 @@ -33,19 +33,25 @@ options=('!emptydirs') source=("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} + 0001-WIP-minimize-the-rust-std-component.patch config.toml) -sha256sums=('120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3' +sha256sums=('644263ca7c7106f8ee8fcde6bb16910d246b30668a74be20b8c7e0e9f4a52d80' 'SKIP' '11828fb4823387d820c6715b25f6b2405e60837d12a7469e7a8882911c721837' 'SKIP' - '4773c50dca4ee344e33ea9ef3af89647fedef1ede5cbc2d3a8e57afd88a979cc') + '1d6b69444ef6ff033fe1612e56ecdaad5c52aa44395e704f78b1a047c65b9321' + '27ac00c9e3a1daeed7b5d343cd7ef45c98a348e6d9178b4d7a501d97eb16e5c7') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard prepare() { cd "rustc-$pkgver-src" + # 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 + cp "$srcdir"/config.toml config.toml if [[ $CARCH == armv7h ]]; then @@ -77,13 +83,15 @@ package_rust() { DESTDIR="$pkgdir" python ./x.py install - for license in APACHE MIT; do install -Dm644 "LICENSE-$license" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* - cd "$pkgdir/usr/lib" + # delete unnecesary files, e.g. components and manifest files only used for the uninstall script + cd "$pkgdir"/usr/lib/rustlib + rm components install.log manifest-* rust-installer-version uninstall.sh - rm rustlib/{components,manifest-rustc,rust-installer-version} - ln -sf rustlib/$CARCH-unknown-linux-gnu/lib/*.so . + # rustbuild always installs copies of the shared libraries to /usr/lib, + # 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" @@ -93,11 +101,12 @@ package_rust() { } package_rust-docs() { - install -d "$pkgdir/usr/share/doc/" - mv "$srcdir"/doc/* "$pkgdir"/usr/share/doc/rust/ + description=('Documentation for the Rust programming language') - for license in APACHE MIT; do install -Dm644 "rustc-$pkgver-src/LICENSE-$license" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + mv "$srcdir"/doc "$pkgdir"/usr/share/doc } # vim:set ts=2 sw=2 et: diff --git a/extra/rust/config.toml b/extra/rust/config.toml index 6d3107fa7..fcdc5a40c 100644 --- a/extra/rust/config.toml +++ b/extra/rust/config.toml @@ -14,9 +14,11 @@ local-rebuild = false prefix = "/usr" [rust] -# 0 or the new default of 16 is faster, but can result in worse performance -# https://github.com/rust-lang/rust/issues/47745 -codegen-units = 1 +# LLVM crashes when passing an object through ThinLTO twice. This is triggered when using rust +# code in cross-language LTO if libstd was built using ThinLTO. +# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html +# https://github.com/rust-lang/rust/issues/54872 +codegen-units-std = 1 debuginfo-level = 0