1 |
commit: 3f2c91135dfa6781d30f033979b5c751bb4a849b |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 12 13:57:45 2020 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 12 15:34:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f2c9113 |
7 |
|
8 |
sci-libs/vtk: fix 8.2.0 ebuild |
9 |
|
10 |
- fix bundled libproj configuration. Thanks to Tiernan Hubble for |
11 |
pointing this out |
12 |
|
13 |
- use system mpi4py |
14 |
|
15 |
Closes: https://bugs.gentoo.org/720372 |
16 |
Closes: https://bugs.gentoo.org/721412 |
17 |
Closes: https://bugs.gentoo.org/721802 |
18 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
19 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
20 |
|
21 |
sci-libs/vtk/vtk-8.2.0.ebuild | 9 ++++----- |
22 |
1 file changed, 4 insertions(+), 5 deletions(-) |
23 |
|
24 |
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild |
25 |
index 8f8191938e7..ee000cf9d83 100644 |
26 |
--- a/sci-libs/vtk/vtk-8.2.0.ebuild |
27 |
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild |
28 |
@@ -167,7 +167,7 @@ src_configure() { |
29 |
-DVTK_USE_SYSTEM_GL2PS=OFF |
30 |
-DVTK_USE_SYSTEM_HDF5=ON |
31 |
-DVTK_USE_SYSTEM_JPEG=ON |
32 |
- -DVTK_USE_SYSTEM_LIBPROJ4=OFF |
33 |
+ -DVTK_USE_SYSTEM_LIBPROJ=OFF |
34 |
-DVTK_USE_SYSTEM_LIBXML2=ON |
35 |
-DVTK_USE_SYSTEM_LibXml2=ON |
36 |
-DVTK_USE_SYSTEM_NETCDF=ON |
37 |
@@ -198,6 +198,7 @@ src_configure() { |
38 |
-DVTK_Group_Tk=$(usex tk) |
39 |
-DVTK_Group_Views=$(usex views) |
40 |
-DVTK_Group_Web=$(usex web) |
41 |
+ -DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)" |
42 |
-DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}" |
43 |
-DVTK_WRAP_JAVA=$(usex java) |
44 |
-DVTK_WRAP_PYTHON=$(usex python) |
45 |
@@ -230,10 +231,8 @@ src_configure() { |
46 |
mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} ) |
47 |
fi |
48 |
|
49 |
- if use tbb; then |
50 |
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" ) |
51 |
- else |
52 |
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" ) |
53 |
+ if use mpi; then |
54 |
+ mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON ) |
55 |
fi |
56 |
|
57 |
if use python; then |