From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- sys-cluster/mpich2/Manifest | 2 +- sys-cluster/mpich2/mpich2-1.5.ebuild | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'sys-cluster/mpich2') diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest index 91722ac076f8..39dfd58c0502 100644 --- a/sys-cluster/mpich2/Manifest +++ b/sys-cluster/mpich2/Manifest @@ -1,4 +1,4 @@ AUX mpich2-1.5-fno-common.patch 531 BLAKE2B 1b7823e5c597384eb3dea589dfca0caee8fee9ed2887ac25c5152812fa1ea4e3e6d31669945e9c0c16b443e85c6fc9e075ad54b3b5d7a60fbc1921917b023978 SHA512 2e71c542e7cf4237c723dea527be06b6f37fd7f338810cf5a544b39234dda089b06ed58dd8e0ff5b7cdd3c716a0bae90b6e47c0bb03c865a93c962567d3267f5 DIST mpich2-1.5.tar.gz 22826035 BLAKE2B 75075fbdd0111725e5bce1e828561125cdba2c91ecfb5af7c6ebd0603f8de05aa5813e57bf05b276607d0a6c0a378862b5631ab988f87e67299e7f651efdc76b SHA512 01ef68accdd60af805705c1c7a144a570eee6f01984939fe151a093f963c956fba366247b1058885ba1a2ff626278d30e928e03d394bd6cf2a4b6dab99586c15 -EBUILD mpich2-1.5.ebuild 2727 BLAKE2B 9f7d1ad29151434de36efaefa17865da3586a9835a9634d6f4a54f70afe69ba8bc34e65249b210c4011ee9104461b65d93f82b2297741dacb6a7989e8efab416 SHA512 69ca8dcc575f7c3832a4c3d033b00b772acdc742363c251aeed6f059d7417b0b9a5b5e655a99920083aa873540f461dc1d11f3b22dad174403138524ee4c384d +EBUILD mpich2-1.5.ebuild 2977 BLAKE2B 57e1ce873844d9a05b1dea78d4a8c949cf3c113fa3e43355edb8dfdc3deea72c4d7b81686e530dd39a8bc1a35836a0cc87790be1a95fa842c889a33c6e347f77 SHA512 c676dbd4663a4cb8b06e5bbd97805335501f21ba66898a5fefc4477bd9d4b21c6ff021853b3f77f9f4533c9e741d057b42c0521e7e4d1208e267592c319bf443 MISC metadata.xml 427 BLAKE2B 367f9a26db478ba0c84be955fe5861c50c9bcad56be08f07ed1d958b26f9d9529e6e1e7d0f24a0256306fc93062f5309a068ea2a661fbdcba837c95c7ab2eec5 SHA512 3c0b449002cf029ec027c9f0bb0c0025a142577a2f747eac4b0d96c62255bd76ce6233744eb844d05f2b93d51225e497f4e34357564a6fcce50176bc1cf51e77 diff --git a/sys-cluster/mpich2/mpich2-1.5.ebuild b/sys-cluster/mpich2/mpich2-1.5.ebuild index f73637a3bb19..05eb7a68a7d2 100644 --- a/sys-cluster/mpich2/mpich2-1.5.ebuild +++ b/sys-cluster/mpich2/mpich2-1.5.ebuild @@ -5,7 +5,7 @@ EAPI=5 FORTRAN_NEEDED=fortran -inherit epatch fortran-2 +inherit epatch fortran-2 flag-o-matic MY_PV=${PV/_/} DESCRIPTION="A high performance and portable MPI implementation" @@ -72,17 +72,24 @@ src_configure() { c="${c} --enable-threads=single" fi + # GCC 10 compatibility workaround + # bug #725722 + append-fflags $(test-flags-FC -fallow-argument-mismatch) + export MPICH2LIB_CFLAGS=${CFLAGS} export MPICH2LIB_CPPFLAGS=${CPPFLAGS} export MPICH2LIB_CXXFLAGS=${CXXFLAGS} export MPICH2LIB_FFLAGS=${FFLAGS} export MPICH2LIB_FCFLAGS=${FCFLAGS} export MPICH2LIB_LDFLAGS=${LDFLAGS} - unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS + # dropped w/ bug #725722 fix + #unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS c="${c} --sysconfdir=${EPREFIX}/etc/${PN}" c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}" - econf ${c} \ + + # Forcing Bash as there's quite a few bashisms in the build system + CONFIG_SHELL="${BROOT}/bin/bash" econf \ --with-pm=hydra \ --disable-mpe \ --disable-fast \ -- cgit v1.2.3