Date: Friday, December 20, 2019 @ 02:35:21 Author: heftig Revision: 371948
archrelease: copy trunk to extra-x86_64 Added: rust/repos/extra-x86_64/PKGBUILD (from rev 371947, rust/trunk/PKGBUILD) Deleted: rust/repos/extra-x86_64/0001-WIP-minimize-the-rust-std-component.patch rust/repos/extra-x86_64/PKGBUILD ------------------------------------------------+ 0001-WIP-minimize-the-rust-std-component.patch | 62 ----- PKGBUILD | 274 +++++++++++------------ 2 files changed, 134 insertions(+), 202 deletions(-) Deleted: 0001-WIP-minimize-the-rust-std-component.patch =================================================================== --- 0001-WIP-minimize-the-rust-std-component.patch 2019-12-20 02:34:51 UTC (rev 371947) +++ 0001-WIP-minimize-the-rust-std-component.patch 2019-12-20 02:35:21 UTC (rev 371948) @@ -1,62 +0,0 @@ -From 14948e9d7bdb5cc7e975c1f3435692eeb748f07b 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 | 33 +++++++++------------------------ - 1 file changed, 9 insertions(+), 24 deletions(-) - -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index d9dff77a30e..bd96a6371fc 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -675,36 +675,21 @@ 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 { -- builder.ensure(compile::Std { compiler, target }); -- } -+ builder.ensure(compile::Std { 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 mut cmd = rust_installer(builder); - cmd.arg("generate") --- -2.24.0 - Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-12-20 02:34:51 UTC (rev 371947) +++ PKGBUILD 2019-12-20 02:35:21 UTC (rev 371948) @@ -1,140 +0,0 @@ -# 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.39.0 -pkgrel=1 - -_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} - "http://releases.llvm.org/$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig} - 0001-WIP-minimize-the-rust-std-component.patch) - -sha256sums=('b4a1f6b6a93931f270691aba4fc85eee032fecda973e6b9c774cd06857609357' - 'SKIP' - '56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e' - 'SKIP' - '9e64e6abe9b118ee496c317ef37f4b500b54ecd69e9c02cad2a6a0b7235e9afd') -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" - - # 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 -} - -build() { - cd "rustc-$pkgver-src" - - export RUST_BACKTRACE=1 - export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src" - - python ./x.py dist -j "$(nproc)" - DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)" - - # move docs and lib32 libs out of the way for splitting - mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686 - mv dest-rust/usr/share/doc dest-doc -} - -package_rust() { - depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2') - provides=('cargo' 'rustfmt') - conflicts=('cargo' 'rustfmt') - replaces=('cargo' 'rustfmt') - - cd "rustc-$pkgver-src" - - 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 - 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 - - 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 dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu - 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* - - install -d "$pkgdir"/usr/share/doc - mv dest-doc/* "$pkgdir"/usr/share/doc -} - -# vim:set ts=2 sw=2 et: Copied: rust/repos/extra-x86_64/PKGBUILD (from rev 371947, rust/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-12-20 02:35:21 UTC (rev 371948) @@ -0,0 +1,134 @@ +# 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.40.0 +pkgrel=1 + +_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} + "http://releases.llvm.org/$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}) + +sha256sums=('dd97005578defc10a482bff3e4e728350d2099c60ffcf1f5e189540c39a549ad' + 'SKIP' + '56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e' + 'SKIP') +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" + + 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 +} + +build() { + cd "rustc-$pkgver-src" + + export RUST_BACKTRACE=1 + export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src" + + python ./x.py dist -j "$(nproc)" + DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)" + + # move docs and lib32 libs out of the way for splitting + mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686 + mv dest-rust/usr/share/doc dest-doc +} + +package_rust() { + depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2') + provides=('cargo' 'rustfmt') + conflicts=('cargo' 'rustfmt') + replaces=('cargo' 'rustfmt') + + cd "rustc-$pkgver-src" + + 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 + 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 + + 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 dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu + 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* + + install -d "$pkgdir"/usr/share/doc + mv dest-doc/* "$pkgdir"/usr/share/doc +} + +# vim:set ts=2 sw=2 et: