SHA256
1
0
forked from pool/mvapich2

Accepting request 562252 from home:eeich:branches:fix-compilers-hpc

- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES.
- Fix library package requires - use HPC macro (boo#1074890).

OBS-URL: https://build.opensuse.org/request/show/562252
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=27
This commit is contained in:
Nicolas Morey-Chaisemartin 2018-01-08 09:46:26 +00:00 committed by Git OBS Bridge
parent ad3a75b979
commit 5d47c0a7fe
2 changed files with 16 additions and 10 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 5 19:03:44 UTC 2018 - eich@suse.com
- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES.
- Fix library package requires - use HPC macro (boo#1074890).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 6 14:06:37 UTC 2017 - nmoreychaisemartin@suse.com Fri Oct 6 14:06:37 UTC 2017 - nmoreychaisemartin@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package mvapich2 # spec file for package mvapich2
# #
# 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -85,30 +85,30 @@ ExclusiveArch: do_not_build
%{bcond_without hpc} %{bcond_without hpc}
%endif %endif
%if "%flavor" == "gnu6-hpc" %if "%flavor" == "gnu7-hpc"
%define compiler_family gnu %define compiler_family gnu
%define c_f_ver 6 %define c_f_ver 7
%define build_flavor verbs %define build_flavor verbs
%{bcond_without hpc} %{bcond_without hpc}
%endif %endif
%if "%flavor" == "gnu6-hpc-testsuite" %if "%flavor" == "gnu7-hpc-testsuite"
%define compiler_family gnu %define compiler_family gnu
%define c_f_ver 6 %define c_f_ver 7
%define testsuite 1 %define testsuite 1
%define build_flavor verbs %define build_flavor verbs
%{bcond_without hpc} %{bcond_without hpc}
%endif %endif
%if "%flavor" == "gnu6-hpc-psm" %if "%flavor" == "gnu7-hpc-psm"
%define compiler_family gnu %define compiler_family gnu
%define c_f_ver 6 %define c_f_ver 7
%define build_flavor psm %define build_flavor psm
%{bcond_without hpc} %{bcond_without hpc}
%endif %endif
%if "%flavor" == "gnu6-hpc-psm2" %if "%flavor" == "gnu7-hpc-psm2"
%define compiler_family gnu %define compiler_family gnu
%define c_f_ver 6 %define c_f_ver 7
%define build_flavor psm2 %define build_flavor psm2
%{bcond_without hpc} %{bcond_without hpc}
%endif %endif
@ -202,7 +202,7 @@ BuildRequires: libibmad-devel
%if %{without hpc} %if %{without hpc}
Requires: mpi-selector Requires: mpi-selector
%else %else
Requires: lua-lmod %hpc_requires
%endif %endif
%description %description