1 |
commit: 2ad7471df4b05d94ce984de1b54f6f2f8304ff34 |
2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
3 |
AuthorDate: Sun Feb 19 15:21:20 2023 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 27 16:46:53 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad7471d |
7 |
|
8 |
sci-libs/vtk: build against CUDA 12 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/894646 |
11 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/29664 |
13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
14 |
|
15 |
...k-9.2.5-Fix-compilation-error-with-CUDA-12.patch | 21 +++++++++++++++++++++ |
16 |
sci-libs/vtk/vtk-9.2.5.ebuild | 1 + |
17 |
2 files changed, 22 insertions(+) |
18 |
|
19 |
diff --git a/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch b/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch |
20 |
new file mode 100644 |
21 |
index 000000000000..9b8583fa61e2 |
22 |
--- /dev/null |
23 |
+++ b/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch |
24 |
@@ -0,0 +1,21 @@ |
25 |
+https://894646.bugs.gentoo.org/attachment.cgi?id=851914 |
26 |
+https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2972/diffs |
27 |
+ |
28 |
+From be96ea7d85fefcad876729377c1b73a295d1c732 Mon Sep 17 00:00:00 2001 |
29 |
+From: "Luke A. Guest" <laguest@×××××××.com> |
30 |
+Date: Thu, 16 Feb 2023 16:57:32 +0000 |
31 |
+Subject: [PATCH] Fix compilation error with CUDA 12. |
32 |
+ |
33 |
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ExecutionPolicy.h |
34 |
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ExecutionPolicy.h |
35 |
+@@ -17,6 +17,7 @@ |
36 |
+ #include <vtkm/exec/cuda/internal/ThrustPatches.h> |
37 |
+ VTKM_THIRDPARTY_PRE_INCLUDE |
38 |
+ #include <thrust/execution_policy.h> |
39 |
++#include <thrust/sort.h> |
40 |
+ #include <thrust/system/cuda/execution_policy.h> |
41 |
+ #include <thrust/system/cuda/memory.h> |
42 |
+ VTKM_THIRDPARTY_POST_INCLUDE |
43 |
+-- |
44 |
+2.39.1 |
45 |
+ |
46 |
|
47 |
diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild |
48 |
index 88721c38e704..eb117e951095 100644 |
49 |
--- a/sci-libs/vtk/vtk-9.2.5.ebuild |
50 |
+++ b/sci-libs/vtk/vtk-9.2.5.ebuild |
51 |
@@ -163,6 +163,7 @@ PATCHES=( |
52 |
"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch |
53 |
"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch |
54 |
"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-for-gcc-13.patch |
55 |
+ "${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch |
56 |
) |
57 |
|
58 |
DOCS=( CONTRIBUTING.md README.md ) |