[gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpich/

["Sam James" <sam@gentoo.org>]

commit:     14d08304513db0d19e6b4720d747fbce302074c3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 23 20:20:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 20:31:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d08304

sys-cluster/mpich: workaround build failure with GCC 10

Closes: https://bugs.gentoo.org/725842
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-cluster/mpich/mpich-3.3-r1.ebuild | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/mpich/mpich-3.3-r1.ebuild b/sys-cluster/mpich/mpich-3.3-r1.ebuild
index 5aab7b8bb09..f3cd4b9f84d 100644
--- a/sys-cluster/mpich/mpich-3.3-r1.ebuild
+++ b/sys-cluster/mpich/mpich-3.3-r1.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=6
@@ -6,7 +6,7 @@ EAPI=6
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD="77 90"
 
-inherit fortran-2 multilib-minimal multilib autotools
+inherit fortran-2 multilib-minimal multilib flag-o-matic autotools
 
 MY_PV=${PV/_/}
 DESCRIPTION="A high performance and portable MPI implementation"
@@ -94,15 +94,22 @@ multilib_src_configure() {
 
 	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
 
+	# GCC 10 compatibility workaround
+	# bug #725842
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	export MPICHLIB_CFLAGS="${CFLAGS}"
 	export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
 	export MPICHLIB_CXXFLAGS="${CXXFLAGS}"
 	export MPICHLIB_FFLAGS="${FFLAGS}"
 	export MPICHLIB_FCFLAGS="${FCFLAGS}"
 	export MPICHLIB_LDFLAGS="${LDFLAGS}"
-	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
 
-	ECONF_SOURCE=${S} econf \
+	# dropped w/ bug #725842 fix
+	#unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	# Forcing Bash as there's quite a few bashisms in the build system
+	CONFIG_SHELL="${BROOT}/bin/bash" ECONF_SOURCE=${S} econf \
 		--enable-shared \
 		--with-hwloc-prefix="${EPREFIX}/usr" \
 		--with-hwloc-libdir="$(get_libdir)" \