Date: Saturday, May 9, 2020 @ 03:16:33 Author: heftig Revision: 382835
archrelease: copy trunk to extra-x86_64 Added: rust/repos/extra-x86_64/70163.patch (from rev 382834, rust/trunk/70163.patch) rust/repos/extra-x86_64/PKGBUILD (from rev 382834, rust/trunk/PKGBUILD) Deleted: rust/repos/extra-x86_64/70163.patch rust/repos/extra-x86_64/PKGBUILD -------------+ 70163.patch | 108 +++++++++++----------- PKGBUILD | 282 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 195 insertions(+), 195 deletions(-) Deleted: 70163.patch =================================================================== --- 70163.patch 2020-05-09 03:12:38 UTC (rev 382834) +++ 70163.patch 2020-05-09 03:16:33 UTC (rev 382835) @@ -1,54 +0,0 @@ -From a94fa896cc92d5e0678376cf5aa8b64af0899732 Mon Sep 17 00:00:00 2001 -From: Nikita Popov <nikita....@gmail.com> -Date: Tue, 4 Feb 2020 20:35:50 +0100 -Subject: [PATCH 4/5] Fix timeTraceProfilerInitialize for LLVM 10 - ---- - src/rustllvm/PassWrapper.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp -index 90d24d20737db..9e8614e3b6d34 100644 ---- a/src/rustllvm/PassWrapper.cpp -+++ b/src/rustllvm/PassWrapper.cpp -@@ -67,7 +67,11 @@ extern "C" void LLVMInitializePasses() { - } - - extern "C" void LLVMTimeTraceProfilerInitialize() { --#if LLVM_VERSION_GE(9, 0) -+#if LLVM_VERSION_GE(10, 0) -+ timeTraceProfilerInitialize( -+ /* TimeTraceGranularity */ 0, -+ /* ProcName */ "rustc"); -+#elif LLVM_VERSION_GE(9, 0) - timeTraceProfilerInitialize(); - #endif - } - -From 497f879b1e24c369362bcd821959ffabc50a8a31 Mon Sep 17 00:00:00 2001 -From: Nikita Popov <nikita....@gmail.com> -Date: Mon, 2 Mar 2020 22:37:55 +0100 -Subject: [PATCH 5/5] Update CreateMemSet() usage for LLVM 10 - ---- - src/rustllvm/RustWrapper.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp -index 25cfee3373dc4..799adb418822d 100644 ---- a/src/rustllvm/RustWrapper.cpp -+++ b/src/rustllvm/RustWrapper.cpp -@@ -1333,8 +1333,13 @@ extern "C" LLVMValueRef LLVMRustBuildMemSet(LLVMBuilderRef B, - LLVMValueRef Dst, unsigned DstAlign, - LLVMValueRef Val, - LLVMValueRef Size, bool IsVolatile) { -+#if LLVM_VERSION_GE(10, 0) -+ return wrap(unwrap(B)->CreateMemSet( -+ unwrap(Dst), unwrap(Val), unwrap(Size), MaybeAlign(DstAlign), IsVolatile)); -+#else - return wrap(unwrap(B)->CreateMemSet( - unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile)); -+#endif - } - - extern "C" LLVMValueRef Copied: rust/repos/extra-x86_64/70163.patch (from rev 382834, rust/trunk/70163.patch) =================================================================== --- 70163.patch (rev 0) +++ 70163.patch 2020-05-09 03:16:33 UTC (rev 382835) @@ -0,0 +1,54 @@ +From a94fa896cc92d5e0678376cf5aa8b64af0899732 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita....@gmail.com> +Date: Tue, 4 Feb 2020 20:35:50 +0100 +Subject: [PATCH 4/5] Fix timeTraceProfilerInitialize for LLVM 10 + +--- + src/rustllvm/PassWrapper.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp +index 90d24d20737db..9e8614e3b6d34 100644 +--- a/src/rustllvm/PassWrapper.cpp ++++ b/src/rustllvm/PassWrapper.cpp +@@ -67,7 +67,11 @@ extern "C" void LLVMInitializePasses() { + } + + extern "C" void LLVMTimeTraceProfilerInitialize() { +-#if LLVM_VERSION_GE(9, 0) ++#if LLVM_VERSION_GE(10, 0) ++ timeTraceProfilerInitialize( ++ /* TimeTraceGranularity */ 0, ++ /* ProcName */ "rustc"); ++#elif LLVM_VERSION_GE(9, 0) + timeTraceProfilerInitialize(); + #endif + } + +From 497f879b1e24c369362bcd821959ffabc50a8a31 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita....@gmail.com> +Date: Mon, 2 Mar 2020 22:37:55 +0100 +Subject: [PATCH 5/5] Update CreateMemSet() usage for LLVM 10 + +--- + src/rustllvm/RustWrapper.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp +index 25cfee3373dc4..799adb418822d 100644 +--- a/src/rustllvm/RustWrapper.cpp ++++ b/src/rustllvm/RustWrapper.cpp +@@ -1333,8 +1333,13 @@ extern "C" LLVMValueRef LLVMRustBuildMemSet(LLVMBuilderRef B, + LLVMValueRef Dst, unsigned DstAlign, + LLVMValueRef Val, + LLVMValueRef Size, bool IsVolatile) { ++#if LLVM_VERSION_GE(10, 0) ++ return wrap(unwrap(B)->CreateMemSet( ++ unwrap(Dst), unwrap(Val), unwrap(Size), MaybeAlign(DstAlign), IsVolatile)); ++#else + return wrap(unwrap(B)->CreateMemSet( + unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile)); ++#endif + } + + extern "C" LLVMValueRef Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-09 03:12:38 UTC (rev 382834) +++ PKGBUILD 2020-05-09 03:16:33 UTC (rev 382835) @@ -1,141 +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.43.0 -pkgrel=2 - -_llvm_ver=10.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} - 70163.patch) - -sha256sums=('75f6ac6c9da9f897f4634d5a07be4084692f7ccc2d2bb89337be86cfc18453a1' - 'SKIP' - '6a7da64d3a0a7320577b68b9ca4933bdcab676e898b759850e827333c3282c75' - 'SKIP' - '8c534799254d5e0124479875a3f90ff1537840a6d3848dab5f76ce55fe4f63e3') -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" - - # LLVM 10 - patch -Np1 -i ../70163.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') - optdepends=('lldb: rust-lldb script' - 'gdb: rust-gdb script') - 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 382834, rust/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-09 03:16:33 UTC (rev 382835) @@ -0,0 +1,141 @@ +# 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.43.1 +pkgrel=1 + +_llvm_ver=10.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} + 70163.patch) + +sha256sums=('cde177b4a8c687da96f20de27630a1eb55c9d146a15e4c900d5c31cd3c3ac41d' + 'SKIP' + '6a7da64d3a0a7320577b68b9ca4933bdcab676e898b759850e827333c3282c75' + 'SKIP' + '8c534799254d5e0124479875a3f90ff1537840a6d3848dab5f76ce55fe4f63e3') +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" + + # LLVM 10 + patch -Np1 -i ../70163.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') + optdepends=('lldb: rust-lldb script' + 'gdb: rust-gdb script') + 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: