[gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpich2/files/, sys-cluster/mpich2/

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpich2/files/, sys-cluster/mpich2/

[Andreas K. Hüttel]

commit:     a0bff5f8f325911ec904ac8eab65e4976d2aeda2
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  6 16:05:29 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 16:05:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0bff5f8

sys-cluster/mpich2: Fix build with gcc-10

Closes: https://bugs.gentoo.org/716664
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>

 .../mpich2/files/mpich2-1.5-fno-common.patch        | 21 +++++++++++++++++++++
 sys-cluster/mpich2/mpich2-1.5.ebuild                |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/mpich2/files/mpich2-1.5-fno-common.patch b/sys-cluster/mpich2/files/mpich2-1.5-fno-common.patch
new file mode 100644
index 00000000000..ce0c1911b16
--- /dev/null
+++ b/sys-cluster/mpich2/files/mpich2-1.5-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/src/pm/hydra/pm/pmiserv/pmip_cb.c
++++ b/src/pm/hydra/pm/pmiserv/pmip_cb.c
+@@ -12,7 +12,6 @@
+ #include "topo.h"
+ #include "hydt_ftb.h"
+ 
+-struct HYD_pmcd_pmip HYD_pmcd_pmip;
+ struct HYD_pmcd_pmip_pmi_handle *HYD_pmcd_pmip_pmi_handle = { 0 };
+ 
+ static int storage_len = 0;
+--- a/src/pm/hydra/pm/pmiserv/pmip.c
++++ b/src/pm/hydra/pm/pmiserv/pmip.c
+@@ -11,8 +11,6 @@
+ #include "topo.h"
+ #include "hydt_ftb.h"
+ 
+-struct HYD_pmcd_pmip HYD_pmcd_pmip;
+-
+ static HYD_status init_params(void)
+ {
+     HYD_status status = HYD_SUCCESS;

diff --git a/sys-cluster/mpich2/mpich2-1.5.ebuild b/sys-cluster/mpich2/mpich2-1.5.ebuild
index 1fc1095762f..159474a613c 100644
--- a/sys-cluster/mpich2/mpich2-1.5.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -43,6 +43,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-fno-common.patch"
+
 	# Using MPICH2LIB_LDFLAGS doesn't seem to full work.
 	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
 		src/packaging/pkgconfig/mpich2.pc.in \