From 7c5588821e24beb2b450e59d72e128a30b16f720 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 11 Oct 2018 10:31:34 +0200
Subject: [PATCH] mpich - variant with use-flag 'merlin' added - build-script
 reviewed

---
 Compiler/mpich/build          | 26 +++++++++++++++-----------
 Compiler/mpich/files/variants |  9 +++++----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Compiler/mpich/build b/Compiler/mpich/build
index 4a3a425..f34dcb7 100755
--- a/Compiler/mpich/build
+++ b/Compiler/mpich/build
@@ -1,16 +1,20 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://www.mpich.org/static/downloads/$V/$P-$V.tar.gz"
-
-pbuild::configure() {
-	unset F90
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		--enable-cxx \
-		--enable-fortran \
-		|| exit 1
-}
+pbuild::set_download_url "http://www.mpich.org/static/downloads/$V/$P-${V_PKG}.tar.gz"
 
 pbuild::add_to_group 'Compiler'
-pbuild::set_docfiles 'COPYRIGHT' 'README'
+
+module use System
+
+pbuild::pre_configure() {
+	unset F90
+	pbuild::add_configure_args "--enable-cxx"
+	pbuild::add_configure_args "--enable-fortran"
+	if pbuild::use_flag merlin; then
+		pbuild::add_configure_args "--with-device=ch3:nemesis:mxm"
+		pbuild::add_configure_args "--with-mxm=${MXM_DIR}"
+	fi
+}
+
+pbuild::install_docfiles 'COPYRIGHT' 'README'
 pbuild::make_all
diff --git a/Compiler/mpich/files/variants b/Compiler/mpich/files/variants
index 16deb91..20617c5 100644
--- a/Compiler/mpich/files/variants
+++ b/Compiler/mpich/files/variants
@@ -1,4 +1,5 @@
-mpich/3.2.1	stable		gcc/5.5.0
-mpich/3.2.1	stable		gcc/6.4.0
-mpich/3.2.1	stable		gcc/7.3.0
-mpich/3.2.1	stable		intel/17.4
+mpich/3.2.1			stable		gcc/5.5.0
+mpich/3.2.1			stable		gcc/6.4.0
+mpich/3.2.1			stable		gcc/7.3.0
+mpich/3.2.1_merlin		unstable	gcc/7.3.0 b:binutils/2.29 b:mxm/3.6.3104
+mpich/3.2.1			stable		intel/17.4