| 1 |
commit: fab20bbcbf246d0868b8d70b02ced33972f7c137 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 2 03:02:35 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 2 03:02:35 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab20bbc |
| 7 |
|
| 8 |
sys-cluster/openmpi: add upstream patch for build failure |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/828123 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/openmpi-4.1.2-missing-includes.patch | 32 ++++++++++++++++++++++ |
| 14 |
sys-cluster/openmpi/openmpi-4.1.2.ebuild | 6 +++- |
| 15 |
2 files changed, 37 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sys-cluster/openmpi/files/openmpi-4.1.2-missing-includes.patch b/sys-cluster/openmpi/files/openmpi-4.1.2-missing-includes.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..89abc049df4e |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-cluster/openmpi/files/openmpi-4.1.2-missing-includes.patch |
| 22 |
@@ -0,0 +1,32 @@ |
| 23 |
+https://github.com/open-mpi/ompi/commit/927e9aa97373dac652f9cba4813e6ee609ca2830 |
| 24 |
+https://bugs.gentoo.org/828123 |
| 25 |
+ |
| 26 |
+From: George Bosilca <bosilca@×××××××.edu> |
| 27 |
+Date: Tue, 23 Nov 2021 14:28:11 -0500 |
| 28 |
+Subject: [PATCH] Fix compile failure with enable-heterogeneous. |
| 29 |
+ |
| 30 |
+An internal header file was missing, leading to an incomplete type. |
| 31 |
+ |
| 32 |
+Fixes #9697. |
| 33 |
+ |
| 34 |
+Signed-off-by: George Bosilca <bosilca@×××××××.edu> |
| 35 |
+--- a/ompi/mca/coll/base/coll_base_alltoall.c |
| 36 |
++++ b/ompi/mca/coll/base/coll_base_alltoall.c |
| 37 |
+@@ -29,6 +29,7 @@ |
| 38 |
+ #include "mpi.h" |
| 39 |
+ #include "ompi/constants.h" |
| 40 |
+ #include "ompi/datatype/ompi_datatype.h" |
| 41 |
++#include "opal/datatype/opal_convertor_internal.h" |
| 42 |
+ #include "ompi/communicator/communicator.h" |
| 43 |
+ #include "ompi/mca/coll/coll.h" |
| 44 |
+ #include "ompi/mca/coll/base/coll_tags.h" |
| 45 |
+--- a/ompi/mca/coll/base/coll_base_alltoallv.c |
| 46 |
++++ b/ompi/mca/coll/base/coll_base_alltoallv.c |
| 47 |
+@@ -31,6 +31,7 @@ |
| 48 |
+ #include "mpi.h" |
| 49 |
+ #include "ompi/constants.h" |
| 50 |
+ #include "ompi/datatype/ompi_datatype.h" |
| 51 |
++#include "opal/datatype/opal_convertor_internal.h" |
| 52 |
+ #include "ompi/communicator/communicator.h" |
| 53 |
+ #include "ompi/mca/coll/coll.h" |
| 54 |
+ #include "ompi/mca/coll/base/coll_tags.h" |
| 55 |
|
| 56 |
diff --git a/sys-cluster/openmpi/openmpi-4.1.2.ebuild b/sys-cluster/openmpi/openmpi-4.1.2.ebuild |
| 57 |
index 6652c805f75a..036f1cbe8cb6 100644 |
| 58 |
--- a/sys-cluster/openmpi/openmpi-4.1.2.ebuild |
| 59 |
+++ b/sys-cluster/openmpi/openmpi-4.1.2.ebuild |
| 60 |
@@ -1,4 +1,4 @@ |
| 61 |
-# Copyright 1999-2021 Gentoo Authors |
| 62 |
+# Copyright 1999-2022 Gentoo Authors |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
|
| 65 |
EAPI=7 |
| 66 |
@@ -71,6 +71,10 @@ MULTILIB_WRAPPED_HEADERS=( |
| 67 |
/usr/include/openmpi/mpiext/mpiext_cuda_c.h |
| 68 |
) |
| 69 |
|
| 70 |
+PATCHES=( |
| 71 |
+ "${FILESDIR}"/${PN}-4.1.2-missing-includes.patch |
| 72 |
+) |
| 73 |
+ |
| 74 |
pkg_setup() { |
| 75 |
fortran-2_pkg_setup |
| 76 |
java-pkg-opt-2_pkg_setup |
Archives