From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE64B158012 for ; Thu, 23 Sep 2021 20:31:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B906E092D; Thu, 23 Sep 2021 20:31:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EBC9E091A for ; Thu, 23 Sep 2021 20:31:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C164342CDC for ; Thu, 23 Sep 2021 20:31:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37444CF for ; Thu, 23 Sep 2021 20:31:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1632429081.14d08304513db0d19e6b4720d747fbce302074c3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpich/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/mpich/mpich-3.3-r1.ebuild X-VCS-Directories: sys-cluster/mpich/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 14d08304513db0d19e6b4720d747fbce302074c3 X-VCS-Branch: master Date: Thu, 23 Sep 2021 20:31:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fc78ecea-e075-438f-9a7b-dbd66b7dbe9b X-Archives-Hash: 296469331deb5faa014aca0d79d93bdf commit: 14d08304513db0d19e6b4720d747fbce302074c3 Author: Sam James gentoo org> AuthorDate: Thu Sep 23 20:20:51 2021 +0000 Commit: Sam James gentoo 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 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)" \