| 1 |
commit: 14d08304513db0d19e6b4720d747fbce302074c3 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 23 20:20:51 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 23 20:31:21 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d08304 |
| 7 |
|
| 8 |
sys-cluster/mpich: workaround build failure with GCC 10 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/725842 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-cluster/mpich/mpich-3.3-r1.ebuild | 15 +++++++++++---- |
| 14 |
1 file changed, 11 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-cluster/mpich/mpich-3.3-r1.ebuild b/sys-cluster/mpich/mpich-3.3-r1.ebuild |
| 17 |
index 5aab7b8bb09..f3cd4b9f84d 100644 |
| 18 |
--- a/sys-cluster/mpich/mpich-3.3-r1.ebuild |
| 19 |
+++ b/sys-cluster/mpich/mpich-3.3-r1.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2020 Gentoo Authors |
| 22 |
+# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 27 |
FORTRAN_NEEDED=fortran |
| 28 |
FORTRAN_STANDARD="77 90" |
| 29 |
|
| 30 |
-inherit fortran-2 multilib-minimal multilib autotools |
| 31 |
+inherit fortran-2 multilib-minimal multilib flag-o-matic autotools |
| 32 |
|
| 33 |
MY_PV=${PV/_/} |
| 34 |
DESCRIPTION="A high performance and portable MPI implementation" |
| 35 |
@@ -94,15 +94,22 @@ multilib_src_configure() { |
| 36 |
|
| 37 |
c="${c} --sysconfdir=${EPREFIX}/etc/${PN}" |
| 38 |
|
| 39 |
+ # GCC 10 compatibility workaround |
| 40 |
+ # bug #725842 |
| 41 |
+ append-fflags $(test-flags-FC -fallow-argument-mismatch) |
| 42 |
+ |
| 43 |
export MPICHLIB_CFLAGS="${CFLAGS}" |
| 44 |
export MPICHLIB_CPPFLAGS="${CPPFLAGS}" |
| 45 |
export MPICHLIB_CXXFLAGS="${CXXFLAGS}" |
| 46 |
export MPICHLIB_FFLAGS="${FFLAGS}" |
| 47 |
export MPICHLIB_FCFLAGS="${FCFLAGS}" |
| 48 |
export MPICHLIB_LDFLAGS="${LDFLAGS}" |
| 49 |
- unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS |
| 50 |
|
| 51 |
- ECONF_SOURCE=${S} econf \ |
| 52 |
+ # dropped w/ bug #725842 fix |
| 53 |
+ #unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS |
| 54 |
+ |
| 55 |
+ # Forcing Bash as there's quite a few bashisms in the build system |
| 56 |
+ CONFIG_SHELL="${BROOT}/bin/bash" ECONF_SOURCE=${S} econf \ |
| 57 |
--enable-shared \ |
| 58 |
--with-hwloc-prefix="${EPREFIX}/usr" \ |
| 59 |
--with-hwloc-libdir="$(get_libdir)" \ |
Archives