[arch-commits] Commit in rust/trunk (70163.patch PKGBUILD)

[Jan Steffens]

    Date: Friday, June 5, 2020 @ 00:39:45
  Author: heftig
Revision: 388319

1.44.0-1

Modified:
  rust/trunk/PKGBUILD
Deleted:
  rust/trunk/70163.patch

-------------+
 70163.patch |   54 ------------------------------------------------------
 PKGBUILD    |   17 ++++++-----------
 2 files changed, 6 insertions(+), 65 deletions(-)

Deleted: 70163.patch
===================================================================
--- 70163.patch	2020-06-05 00:20:30 UTC (rev 388318)
+++ 70163.patch	2020-06-05 00:39:45 UTC (rev 388319)
@@ -1,54 +0,0 @@
-From a94fa896cc92d5e0678376cf5aa8b64af0899732 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <nikita.ppv at 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.ppv at 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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-05 00:20:30 UTC (rev 388318)
+++ PKGBUILD	2020-06-05 00:39:45 UTC (rev 388319)
@@ -5,7 +5,7 @@
 
 pkgname=('rust' 'lib32-rust-libs' 'rust-docs')
 epoch=1
-pkgver=1.43.1
+pkgver=1.44.0
 pkgrel=1
 
 _llvm_ver=10.0.0
@@ -18,17 +18,15 @@
 makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'lib32-gcc-libs' 'perl' 'python' 'curl' 'cmake')
 checkdepends=('procps-ng' 'gdb')
 
-options=('!emptydirs')
+options=('!emptydirs' '!strip')
 
 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)
+        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
 
-sha256sums=('cde177b4a8c687da96f20de27630a1eb55c9d146a15e4c900d5c31cd3c3ac41d'
+sha256sums=('bf2df62317e533e84167c5bc7d4351a99fdab1f9cd6e6ba09f51996ad8561100'
             'SKIP'
             '6a7da64d3a0a7320577b68b9ca4933bdcab676e898b759850e827333c3282c75'
-            'SKIP'
-            '8c534799254d5e0124479875a3f90ff1537840a6d3848dab5f76ce55fe4f63e3')
+            'SKIP')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar at redhat.com>
               'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
@@ -36,9 +34,6 @@
 prepare() {
   cd "rustc-$pkgver-src"
 
-  # LLVM 10
-  patch -Np1 -i ../70163.patch
-
   cat >config.toml <<END
 [llvm]
 link-shared = true
@@ -63,7 +58,7 @@
 # https://github.com/rust-lang/rust/issues/54872
 codegen-units-std = 1
 
-debuginfo-level = 2
+debuginfo-level-std = 2
 
 channel = "stable"