diff options
| author | tnn <tnn@pkgsrc.org> | 2020-05-16 19:48:48 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-05-16 19:48:48 +0000 |
| commit | 57f0ce8fe5b61b334a0b38107072270a6bbfd39c (patch) | |
| tree | 822da5963ebefc4e03a19f11abde3f9d96c4728f /lang | |
| parent | eb95ae6ceb19887e7e51f5dd0ffcabb552862cff (diff) | |
| download | pkgsrc-57f0ce8fe5b61b334a0b38107072270a6bbfd39c.tar.gz | |
rust: use upstream's fix for previous
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/rust/distinfo | 4 | ||||
| -rw-r--r-- | lang/rust/patches/patch-src_rustllvm_PassWrapper.cpp | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 5aa1b17243a..69248ffac38 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.110 2020/05/16 19:36:12 tnn Exp $ +$NetBSD: distinfo,v 1.111 2020/05/16 19:48:48 tnn Exp $ SHA1 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 91517fa95f954427c627cf63eb7c518abd068f3e RMD160 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 06a3d922b27aac2deb570301542897a131b47cd0 @@ -120,7 +120,7 @@ SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = c5e74d0e8deb555 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6 SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2675b93a1d636b297a3e1e84b915a15a3da67939 -SHA1 (patch-src_rustllvm_PassWrapper.cpp) = 057b21eb100613d24a496b72a0d6e22548101a96 +SHA1 (patch-src_rustllvm_PassWrapper.cpp) = f53da4ca69ea90b23aee8881ee8bf75c23f603e3 SHA1 (patch-src_rustllvm_RustWrapper.cpp) = 3440de7536d05ea93c1d5c01bb09f5472e830ca8 SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80 SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c diff --git a/lang/rust/patches/patch-src_rustllvm_PassWrapper.cpp b/lang/rust/patches/patch-src_rustllvm_PassWrapper.cpp index 686350201e7..63f147f995c 100644 --- a/lang/rust/patches/patch-src_rustllvm_PassWrapper.cpp +++ b/lang/rust/patches/patch-src_rustllvm_PassWrapper.cpp @@ -1,15 +1,19 @@ -$NetBSD: patch-src_rustllvm_PassWrapper.cpp,v 1.1 2020/05/16 19:36:13 tnn Exp $ +$NetBSD: patch-src_rustllvm_PassWrapper.cpp,v 1.2 2020/05/16 19:48:48 tnn Exp $ LLVM 10 compatibility --- src/rustllvm/PassWrapper.cpp.orig 2020-04-20 22:17:56.000000000 +0000 +++ src/rustllvm/PassWrapper.cpp -@@ -67,7 +67,7 @@ extern "C" void LLVMInitializePasses() { +@@ -67,7 +67,11 @@ extern "C" void LLVMInitializePasses() { } extern "C" void LLVMTimeTraceProfilerInitialize() { -#if LLVM_VERSION_GE(9, 0) -+#if LLVM_VERSION_GE(9, 0) && LLVM_VERSION_LT(10, 0) ++#if LLVM_VERSION_GE(10, 0) ++ timeTraceProfilerInitialize( ++ /* TimeTraceGranularity */ 0, ++ /* ProcName */ "rustc"); ++#elif LLVM_VERSION_GE(9, 0) timeTraceProfilerInitialize(); #endif } |