From d1ed20dc915ad2ce95e07ff1cce1bd1fb492920c8735075915ba21feffd65f2c Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Tue, 9 Jan 2018 10:27:39 +0000
Subject: [PATCH] Accepting request 562827 from
 home:eeich:branches:fix-compilers-hpc

- Add gcc7 as additional compiler flavor for HPC on SLES.
- Add support for mpich and openmpi3 for HPC.

OBS-URL: https://build.opensuse.org/request/show/562827
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mpiP?expand=0&rev=13
---
 _multibuild  |  2 ++
 mpiP.changes |  6 ++++++
 mpiP.spec    | 41 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/_multibuild b/_multibuild
index 1e5398d..8db5cf7 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,4 +1,6 @@
 <multibuild>
   <package>gnu-openmpi-hpc</package>
+  <package>gnu-openmpi3-hpc</package>
   <package>gnu-mvapich2-hpc</package>
+  <package>gnu-mpich-hpc</package>
 </multibuild>
diff --git a/mpiP.changes b/mpiP.changes
index 3f41e9a..a6c8f52 100644
--- a/mpiP.changes
+++ b/mpiP.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan  5 19:00:01 UTC 2018 - eich@suse.com
+
+- Add gcc7 as additional compiler flavor for HPC on SLES.
+- Add support for mpich and openmpi3 for HPC.
+
 -------------------------------------------------------------------
 Mon Nov 13 12:43:33 UTC 2017 - eich@suse.com
 
diff --git a/mpiP.spec b/mpiP.spec
index c617138..3e19e5a 100644
--- a/mpiP.spec
+++ b/mpiP.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mpiP
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,12 +33,51 @@ ExclusiveArch:  do_not_build
 %define mpi_ver 1
 %endif
 
+%if "%{flavor}" == "gnu-openmpi3-hpc"
+%global compiler_family gnu
+%undefine c_f_ver
+%define mpi_family openmpi
+%define mpi_ver 3
+%endif
+
 %if "%{flavor}" == "gnu-mvapich2-hpc"
 %global compiler_family gnu
 %undefine c_f_ver
 %define mpi_family mvapich2
 %endif
 
+%if "%{flavor}" == "gnu-mpich-hpc"
+%global compiler_family gnu
+%undefine c_f_ver
+%define mpi_family mpich
+%endif
+
+%if "%{flavor}" == "gnu7-openmpi-hpc"
+%global compiler_family gnu
+%define c_f_ver 7
+%define mpi_family openmpi
+%define mpi_ver 1
+%endif
+
+%if "%{flavor}" == "gnu7-openmpi3-hpc"
+%global compiler_family gnu
+%define c_f_ver 7
+%define mpi_family openmpi
+%define mpi_ver 3
+%endif
+
+%if "%{flavor}" == "gnu7-mvapich2-hpc"
+%global compiler_family gnu
+%define c_f_ver 7
+%define mpi_family mvapich2
+%endif
+
+%if "%{flavor}" == "gnu7-mpich-hpc"
+%global compiler_family gnu
+%define c_f_ver 7
+%define mpi_family mpich
+%endif
+
 %{?hpc_init:%{hpc_init -c %compiler_family -m %mpi_family %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}}
 
 Name:           %{?hpc_package_name:%{hpc_package_name %_vers}}%{!?hpc_package_name:%pname}