From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC042138350 for ; Fri, 1 May 2020 16:48:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC5C8E09C6; Fri, 1 May 2020 16:48:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1E8FE0AA1 for ; Fri, 1 May 2020 16:48:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C41B334F074 for ; Fri, 1 May 2020 16:48:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0E6D9C for ; Fri, 1 May 2020 16:48:45 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1588351647.5c9d6ce7a1706c381df35c68f28f56132b57c344.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch sci-libs/vtk/vtk-8.1.0-r6.ebuild X-VCS-Directories: sci-libs/vtk/files/ sci-libs/vtk/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 5c9d6ce7a1706c381df35c68f28f56132b57c344 X-VCS-Branch: master Date: Fri, 1 May 2020 16:48:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 74fff91c-bfda-424c-92b8-556eb3d6852d X-Archives-Hash: eaa3fcf040a1e0e4a42e46e47b67b489 commit: 5c9d6ce7a1706c381df35c68f28f56132b57c344 Author: Matthias Maier gentoo org> AuthorDate: Fri May 1 14:45:17 2020 +0000 Commit: Matthias Maier gentoo org> CommitDate: Fri May 1 16:47:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9d6ce7 sci-libs/vtk: fix compilation with openmpi-4 Closes: https://bugs.gentoo.org/683382 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matthias Maier gentoo.org> sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch | 14 ++++++++++++++ sci-libs/vtk/vtk-8.1.0-r6.ebuild | 6 ++++++ 2 files changed, 20 insertions(+) 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 new file mode 100644 index 00000000000..267c1d91b0c --- /dev/null +++ b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch @@ -0,0 +1,14 @@ +diff --git a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h +index 3173831..e8ee74b 100644 +--- a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h ++++ b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h +@@ -141,4 +141,9 @@ + + #endif + ++ #if OMPI_NUMVERSION >= 40000 ++ #undef PyMPI_HAVE_MPI_LB ++ #undef PyMPI_HAVE_MPI_UB ++ #endif /* OMPI >= 4.0.0 */ ++ + #endif /* !PyMPI_CONFIG_OPENMPI_H */ diff --git a/sci-libs/vtk/vtk-8.1.0-r6.ebuild b/sci-libs/vtk/vtk-8.1.0-r6.ebuild index 06e69225f0f..9e5bc9d717c 100644 --- a/sci-libs/vtk/vtk-8.1.0-r6.ebuild +++ b/sci-libs/vtk/vtk-8.1.0-r6.ebuild @@ -116,6 +116,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/VTK-${PV} +PATCHES=( + "${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch +) + RESTRICT="test" pkg_setup() { @@ -125,6 +129,8 @@ pkg_setup() { } src_prepare() { + default + local x # missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3 for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do