| 1 |
commit: 5c9d6ce7a1706c381df35c68f28f56132b57c344 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 1 14:45:17 2020 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 1 16:47:27 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9d6ce7 |
| 7 |
|
| 8 |
sci-libs/vtk: fix compilation with openmpi-4 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/683382 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 13 |
|
| 14 |
sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch | 14 ++++++++++++++ |
| 15 |
sci-libs/vtk/vtk-8.1.0-r6.ebuild | 6 ++++++ |
| 16 |
2 files changed, 20 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..267c1d91b0c |
| 21 |
--- /dev/null |
| 22 |
+++ b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch |
| 23 |
@@ -0,0 +1,14 @@ |
| 24 |
+diff --git a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h |
| 25 |
+index 3173831..e8ee74b 100644 |
| 26 |
+--- a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h |
| 27 |
++++ b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h |
| 28 |
+@@ -141,4 +141,9 @@ |
| 29 |
+ |
| 30 |
+ #endif |
| 31 |
+ |
| 32 |
++ #if OMPI_NUMVERSION >= 40000 |
| 33 |
++ #undef PyMPI_HAVE_MPI_LB |
| 34 |
++ #undef PyMPI_HAVE_MPI_UB |
| 35 |
++ #endif /* OMPI >= 4.0.0 */ |
| 36 |
++ |
| 37 |
+ #endif /* !PyMPI_CONFIG_OPENMPI_H */ |
| 38 |
|
| 39 |
diff --git a/sci-libs/vtk/vtk-8.1.0-r6.ebuild b/sci-libs/vtk/vtk-8.1.0-r6.ebuild |
| 40 |
index 06e69225f0f..9e5bc9d717c 100644 |
| 41 |
--- a/sci-libs/vtk/vtk-8.1.0-r6.ebuild |
| 42 |
+++ b/sci-libs/vtk/vtk-8.1.0-r6.ebuild |
| 43 |
@@ -116,6 +116,10 @@ DEPEND="${RDEPEND} |
| 44 |
|
| 45 |
S="${WORKDIR}"/VTK-${PV} |
| 46 |
|
| 47 |
+PATCHES=( |
| 48 |
+ "${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch |
| 49 |
+) |
| 50 |
+ |
| 51 |
RESTRICT="test" |
| 52 |
|
| 53 |
pkg_setup() { |
| 54 |
@@ -125,6 +129,8 @@ pkg_setup() { |
| 55 |
} |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
+ default |
| 59 |
+ |
| 60 |
local x |
| 61 |
# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3 |
| 62 |
for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do |
Archives