commit: 1c730e5de29d0d15a9ca4bb3796f60d871bed754
Author: Alex Fan <alex.fan.q <AT> gmail <DOT> com>
AuthorDate: Sun Sep 1 10:55:33 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 22:52:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c730e5d
dev-python/mpi4py: compat for sys-cluster/mpich[-fortran]
Signed-off-by: Alex Fan <alex.fan.q <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mpi4py/files/mpi4py-4-mpich-no-fortran-fix.patch | 20 ++++++++++++++++++++
dev-python/mpi4py/mpi4py-4.0.0.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/dev-python/mpi4py/files/mpi4py-4-mpich-no-fortran-fix.patch
b/dev-python/mpi4py/files/mpi4py-4-mpich-no-fortran-fix.patch
new file mode 100644
index 000000000000..82415dae491d
--- /dev/null
+++ b/dev-python/mpi4py/files/mpi4py-4-mpich-no-fortran-fix.patch
@@ -0,0 +1,20 @@
+diff --git a/src/lib-mpi/compat/mpich.h b/src/lib-mpi/compat/mpich.h
+index 2cd50c1..3ea9510 100644
+--- a/src/lib-mpi/compat/mpich.h
++++ b/src/lib-mpi/compat/mpich.h
+@@ -123,7 +123,6 @@ static int PyMPI_MPICH_MPI_Reduce_c(const void *sendbuf,
void *recvbuf,
+
+ /* --------------------------------------------------------------------------
*/
+
+-#if defined(CIBUILDWHEEL)
+
+ #define PyMPI_MPICH_CALL_WEAK_SYMBOL(function, ...) \
+ if (function) return function(__VA_ARGS__); \
+@@ -159,7 +158,6 @@ static int PyMPI_MPICH_MPI_Status_f2c(const MPI_Fint *fs,
MPI_Status *cs)
+ { PyMPI_MPICH_CALL_WEAK_SYMBOL(MPI_Status_f2c, fs, cs); }
+ #define MPI_Status_f2c PyMPI_MPICH_MPI_Status_f2c
+
+-#endif
+
+ /* --------------------------------------------------------------------------
*/
+
diff --git a/dev-python/mpi4py/mpi4py-4.0.0.ebuild
b/dev-python/mpi4py/mpi4py-4.0.0.ebuild
index a92ac5a8fced..2082140a9e16 100644
--- a/dev-python/mpi4py/mpi4py-4.0.0.ebuild
+++ b/dev-python/mpi4py/mpi4py-4.0.0.ebuild
@@ -33,6 +33,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4-use-mesonpy.patch"
+ "${FILESDIR}/${PN}-4-mpich-no-fortran-fix.patch"
)
python_prepare_all() {