From 059fb38f6c2f49e9bb2f84f05fa154b4aa087d54 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@gmail.com>
Date: Mon, 16 Nov 2020 13:55:00 +0100
Subject: [PATCH] mpich: version 3.3.2 with current GCCs

- reviewed configuration
---
 Compiler/mpich/build                 | 10 ++++++++++
 Compiler/mpich/files/variants.merlin |  2 ++
 Compiler/mpich/files/variants.rhel6  |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Compiler/mpich/build b/Compiler/mpich/build
index 7cd2370..3a4324a 100755
--- a/Compiler/mpich/build
+++ b/Compiler/mpich/build
@@ -11,8 +11,18 @@ pbuild::pre_configure() {
 	pbuild::add_configure_args "--enable-cxx"
 	pbuild::add_configure_args "--enable-fortran"
 	if pbuild::use_flag merlin; then
+		MXM_DIR='/opt/mellanox/mxm/'
 		pbuild::add_configure_args "--with-device=ch3:nemesis:mxm"
 		pbuild::add_configure_args "--with-mxm=${MXM_DIR}"
+		pbuild::add_configure_args "--without-x"
+		#pbuild::add_configure_args "--with-slurm-include=/usr/include/slurm"
+		#pbuild::add_configure_args "--with-slurm-lib=/usr/lib64"
+		#pbuild::add_configure_args "--with-pmi=slurm"
+		#pbuild::add_configure_args "--with-pm=no"
+		pbuild::add_configure_args "--enable-gl=no"
+	fi
+	if [[ "${COMPILER}" == 'gcc' ]] && (( ${COMPILER_VERSION%.*.*} == 10 )); then
+		pbuild::add_configure_args "FFLAGS=-fallow-argument-mismatch"
 	fi
 }
 
diff --git a/Compiler/mpich/files/variants.merlin b/Compiler/mpich/files/variants.merlin
index 30ac8ad..b34d091 100644
--- a/Compiler/mpich/files/variants.merlin
+++ b/Compiler/mpich/files/variants.merlin
@@ -1 +1,3 @@
 mpich/3.2.1_merlin	unstable	gcc/{6.4.0,7.3.0} b:binutils/2.29 b:mxm/3.6.3104
+
+mpich/3.3.2_merlin	unstable	gcc/10.2.0 b:binutils/2.29
diff --git a/Compiler/mpich/files/variants.rhel6 b/Compiler/mpich/files/variants.rhel6
index ca89e5f..018d036 100644
--- a/Compiler/mpich/files/variants.rhel6
+++ b/Compiler/mpich/files/variants.rhel6
@@ -5,4 +5,4 @@ mpich/3.2.1		stable		gcc/{4.8.5,5.5.0,6.4.0,7.3.0,8.2.0}
 mpich/3.2.1		stable		intel/17.4
 
 mpich/3.3		stable		gcc/{7.3.0,7.4.0,8.3.0}
-mpich/3.3.2		unstable	gcc/{7.5.0,8.4.0,9.3.0}
+mpich/3.3.2		unstable	gcc/{7.5.0,8.4.0,9.3.0,10.2.0}