Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpich/
Date: Thu, 23 Sep 2021 20:37:00
Message-Id: 1632429409.146fff709a4168bd9011831dfb64ff3a021855e9.sam@gentoo
1 commit: 146fff709a4168bd9011831dfb64ff3a021855e9
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 23 20:36:31 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 23 20:36:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146fff70
7
8 sys-cluster/mpich: workaround build failure with GCC 10 (stable)
9
10 Bug: https://bugs.gentoo.org/725842
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sys-cluster/mpich/mpich-3.0.4.ebuild | 14 ++++++++++----
14 1 file changed, 10 insertions(+), 4 deletions(-)
15
16 diff --git a/sys-cluster/mpich/mpich-3.0.4.ebuild b/sys-cluster/mpich/mpich-3.0.4.ebuild
17 index 15abf189bc8..828fec76358 100644
18 --- a/sys-cluster/mpich/mpich-3.0.4.ebuild
19 +++ b/sys-cluster/mpich/mpich-3.0.4.ebuild
20 @@ -1,11 +1,11 @@
21 -# Copyright 1999-2018 Gentoo Foundation
22 +# Copyright 1999-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=5
26
27 FORTRAN_NEEDED=fortran
28
29 -inherit fortran-2
30 +inherit fortran-2 flag-o-matic
31
32 MY_PV=${PV/_/}
33 DESCRIPTION="A high performance and portable MPI implementation"
34 @@ -72,15 +72,21 @@ src_configure() {
35 c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
36 c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
37
38 + # GCC 10 compatibility workaround
39 + # bug #725842
40 + append-fflags $(test-flags-FC -fallow-argument-mismatch)
41 +
42 export MPICHLIB_CFLAGS=${CFLAGS}
43 export MPICHLIB_CPPFLAGS=${CPPFLAGS}
44 export MPICHLIB_CXXFLAGS=${CXXFLAGS}
45 export MPICHLIB_FFLAGS=${FFLAGS}
46 export MPICHLIB_FCFLAGS=${FCFLAGS}
47 export MPICHLIB_LDFLAGS=${LDFLAGS}
48 - unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
49 + # dropped w/ bug #725842 fix
50 + #unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
51
52 - econf ${c} \
53 + # Forcing Bash as there's quite a few bashisms in the build system
54 + CONFIG_SHELL="${BROOT}/bin/bash" econf \
55 --with-pm=hydra \
56 --disable-mpe \
57 --disable-fast \