Date: Sunday, October 6, 2019 @ 01:26:30 Author: heftig Revision: 363882
archrelease: copy trunk to staging-x86_64 Added: rust/repos/staging-x86_64/ rust/repos/staging-x86_64/0001-WIP-minimize-the-rust-std-component.patch (from rev 363881, rust/trunk/0001-WIP-minimize-the-rust-std-component.patch) rust/repos/staging-x86_64/PKGBUILD (from rev 363881, rust/trunk/PKGBUILD) rust/repos/staging-x86_64/bootstrap-1.38.patch (from rev 363881, rust/trunk/bootstrap-1.38.patch) ------------------------------------------------+ 0001-WIP-minimize-the-rust-std-component.patch | 74 ++++++++++++ PKGBUILD | 140 +++++++++++++++++++++++ bootstrap-1.38.patch | 13 ++ 3 files changed, 227 insertions(+) Copied: rust/repos/staging-x86_64/0001-WIP-minimize-the-rust-std-component.patch (from rev 363881, rust/trunk/0001-WIP-minimize-the-rust-std-component.patch) =================================================================== --- staging-x86_64/0001-WIP-minimize-the-rust-std-component.patch (rev 0) +++ staging-x86_64/0001-WIP-minimize-the-rust-std-component.patch 2019-10-06 01:26:30 UTC (rev 363882) @@ -0,0 +1,74 @@ +From 2bf05f208272cd58c57f4d7d8d0e10fdb22e8719 Mon Sep 17 00:00:00 2001 +From: Josh Stone <jist...@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(-) + +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 + Copied: rust/repos/staging-x86_64/PKGBUILD (from rev 363881, rust/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2019-10-06 01:26:30 UTC (rev 363882) @@ -0,0 +1,140 @@ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Alexander F Rødseth <xypr...@archlinux.org> +# Contributor: Daniel Micay <danielmi...@gmail.com> +# Contributor: userwithuid <userwith...@gmail.com> + +pkgname=('rust' 'lib32-rust-libs' 'rust-docs') +epoch=1 +pkgver=1.38.0 +pkgrel=2 + +_llvm_ver=9.0.0 + +pkgdesc='Systems programming language focused on safety, speed and concurrency' +url='https://www.rust-lang.org/' +arch=('x86_64') +license=('MIT' 'Apache') + +makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'lib32-gcc-libs' 'perl' 'python' 'curl' 'cmake') +checkdepends=('procps-ng' 'gdb') + +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} + bootstrap-1.38.patch + 0001-WIP-minimize-the-rust-std-component.patch) + +sha256sums=('644263ca7c7106f8ee8fcde6bb16910d246b30668a74be20b8c7e0e9f4a52d80' + 'SKIP' + '56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e' + 'SKIP' + '71935e8994d1045680cde22f72a12c4959e1877e5a42fc21fd034d677100dab3' + '1d6b69444ef6ff033fe1612e56ecdaad5c52aa44395e704f78b1a047c65b9321') +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-...@rust-lang.org> + '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstel...@redhat.com> + 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> + +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 + + cat >config.toml <<END +[llvm] +link-shared = true + +[build] +target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] +cargo = "/usr/bin/cargo" +rustc = "/usr/bin/rustc" +python = "/usr/bin/python" +extended = true +sanitizers = false +profiler = true +vendor = true + +[install] +prefix = "/usr" + +[rust] +# 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 = 2 + +channel = "stable" + +rpath = false + +[target.x86_64-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config" +END +} + +# Don't call build — install will duplicate a lot of work and --keep-stage is not enough + +package_rust() { + depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2') + provides=('cargo' 'rustfmt') + conflicts=('cargo' 'rustfmt') + replaces=('cargo' 'rustfmt') + + 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 -j"$(nproc)" + + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + # 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 + + # 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 and lib32 libs out of the way for splitting + mv "$pkgdir"/usr/share/doc "$srcdir" + mv "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu "$srcdir" + + install -d "$pkgdir"/usr/share/bash-completion + mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/ +} + +package_lib32-rust-libs() { + descriptino=('32-bit libraries for Rust') + depends=('lib32-gcc-libs') + provides=('lib32-rust') + conflicts=('lib32-rust') + replaces=('lib32-rust') + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/ + mv "$srcdir"/i686-unknown-linux-gnu "$pkgdir"/usr/lib/rustlib + ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so +} + +package_rust-docs() { + description=('Documentation for the Rust programming language') + + 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: Copied: rust/repos/staging-x86_64/bootstrap-1.38.patch (from rev 363881, rust/trunk/bootstrap-1.38.patch) =================================================================== --- staging-x86_64/bootstrap-1.38.patch (rev 0) +++ staging-x86_64/bootstrap-1.38.patch 2019-10-06 01:26:30 UTC (rev 363882) @@ -0,0 +1,13 @@ +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>(), + } + } +