Accepting request 752527 from home:eeich:branches:science
- Add support for gcc7. - Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8609). - Disable openmpi1 builds for SLE/Leap > 15.1. - Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). OBS-URL: https://build.opensuse.org/request/show/752527 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=39
This commit is contained in:
Git OBS Bridge
parent
54fc40f5aa
commit
570b55f88d
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 29 22:10:30 UTC 2019 - Egbert Eich <eich@suse.com>
|
||||||
|
|
||||||
|
- Add support for gcc7.
|
||||||
|
- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8609).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 28 16:16:49 UTC 2019 - Egbert Eich <eich@suse.com>
|
||||||
|
|
||||||
|
- Disable openmpi1 builds for SLE/Leap > 15.1.
|
||||||
|
- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Nov 25 21:52:36 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
Mon Nov 25 21:52:36 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
|||||||
166
mumps.spec
166
mumps.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package mumps
|
# spec file for package mumps
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LLC
|
||||||
#
|
#
|
||||||
# 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
|
||||||
@ -32,13 +32,10 @@
|
|||||||
ExclusiveArch: do_not_build
|
ExclusiveArch: do_not_build
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?is_opensuse} || 0%{?is_backports}
|
%if 0%{?sle_version} >= 150200
|
||||||
%undefine DisOMPI1
|
|
||||||
%undefine DisOMPI2
|
|
||||||
%undefine DisOMPI3
|
|
||||||
%else
|
|
||||||
%define DisOMPI1 ExclusiveArch: do_not_build
|
%define DisOMPI1 ExclusiveArch: do_not_build
|
||||||
%undefine DisOMPI2
|
%endif
|
||||||
|
%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200
|
||||||
%define DisOMPI3 ExclusiveArch: do_not_build
|
%define DisOMPI3 ExclusiveArch: do_not_build
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -105,18 +102,6 @@ ExclusiveArch: do_not_build
|
|||||||
%bcond_without scotch
|
%bcond_without scotch
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%{flavor}" == "gnu-mvapich2-hpc"
|
|
||||||
%undefine c_f_ver
|
|
||||||
%global mpi_family mvapich2
|
|
||||||
%bcond_without hpc
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{flavor}" == "gnu-mpich-hpc"
|
|
||||||
%undefine c_f_ver
|
|
||||||
%global mpi_family mpich
|
|
||||||
%bcond_without hpc
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{flavor}" == "gnu-openmpi-hpc"
|
%if "%{flavor}" == "gnu-openmpi-hpc"
|
||||||
%{?DisOMPI1}
|
%{?DisOMPI1}
|
||||||
%undefine c_f_ver
|
%undefine c_f_ver
|
||||||
@ -156,6 +141,147 @@ ExclusiveArch: do_not_build
|
|||||||
%bcond_without hpc
|
%bcond_without hpc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu-mpich-hpc"
|
||||||
|
%undefine c_f_ver
|
||||||
|
%global mpi_family mpich
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu7-openmpi-hpc"
|
||||||
|
%{?DisOMPI1}
|
||||||
|
%define c_f_ver 7
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family openmpi
|
||||||
|
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
|
||||||
|
%define mpi_ver 1
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu7-openmpi2-hpc"
|
||||||
|
%{?DisOMPI2}
|
||||||
|
%define c_f_ver 7
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family openmpi
|
||||||
|
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
|
||||||
|
%define mpi_ver 2
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu7-openmpi3-hpc"
|
||||||
|
%{?DisOMPI3}
|
||||||
|
%define c_f_ver 7
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family openmpi
|
||||||
|
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
|
||||||
|
%define mpi_ver 3
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu7-mvapich2-hpc"
|
||||||
|
%define c_f_ver 7
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family mvapich2
|
||||||
|
%define mumps_f77_mpilibs -lfmpich -lmpich
|
||||||
|
%undefine mpi_ver
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu7-mpich-hpc"
|
||||||
|
%define c_f_ver 7
|
||||||
|
%global mpi_family mpich
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu8-openmpi-hpc"
|
||||||
|
%{?DisOMPI1}
|
||||||
|
%define c_f_ver 8
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family openmpi
|
||||||
|
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
|
||||||
|
%define mpi_ver 1
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu8-openmpi2-hpc"
|
||||||
|
%{?DisOMPI2}
|
||||||
|
%define c_f_ver 8
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family openmpi
|
||||||
|
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
|
||||||
|
%define mpi_ver 2
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu8-openmpi3-hpc"
|
||||||
|
%{?DisOMPI3}
|
||||||
|
%define c_f_ver 8
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family openmpi
|
||||||
|
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
|
||||||
|
%define mpi_ver 3
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu8-mvapich2-hpc"
|
||||||
|
%define c_f_ver 8
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family mvapich2
|
||||||
|
%define mumps_f77_mpilibs -lfmpich -lmpich
|
||||||
|
%undefine mpi_ver
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu8-mpich-hpc"
|
||||||
|
%define c_f_ver 8
|
||||||
|
%global mpi_family mpich
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu9-openmpi-hpc"
|
||||||
|
%{?DisOMPI1}
|
||||||
|
%define c_f_ver 9
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family openmpi
|
||||||
|
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
|
||||||
|
%define mpi_ver 1
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu9-openmpi2-hpc"
|
||||||
|
%{?DisOMPI2}
|
||||||
|
%define c_f_ver 9
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family openmpi
|
||||||
|
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
|
||||||
|
%define mpi_ver 2
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu9-openmpi3-hpc"
|
||||||
|
%{?DisOMPI3}
|
||||||
|
%define c_f_ver 9
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family openmpi
|
||||||
|
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
|
||||||
|
%define mpi_ver 3
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu9-mvapich2-hpc"
|
||||||
|
%define c_f_ver 9
|
||||||
|
# macro mpi is used by macros for master package
|
||||||
|
%global mpi_family mvapich2
|
||||||
|
%define mumps_f77_mpilibs -lfmpich -lmpich
|
||||||
|
%undefine mpi_ver
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu9-mpich-hpc"
|
||||||
|
%define c_f_ver 9
|
||||||
|
%global mpi_family mpich
|
||||||
|
%bcond_without hpc
|
||||||
|
%endif
|
||||||
|
|
||||||
%ifarch i586 s390 ppc armv7l
|
%ifarch i586 s390 ppc armv7l
|
||||||
ExclusiveArch: do_not_build
|
ExclusiveArch: do_not_build
|
||||||
%endif
|
%endif
|
||||||
@ -216,7 +342,7 @@ Group: Productivity/Scientific/Math
|
|||||||
Name: %{package_name}
|
Name: %{package_name}
|
||||||
Version: %{ver}
|
Version: %{ver}
|
||||||
Release: 0
|
Release: 0
|
||||||
Url: http://mumps.enseeiht.fr/
|
URL: http://mumps.enseeiht.fr/
|
||||||
Source0: http://mumps.enseeiht.fr/MUMPS_%{version}.tar.gz#/%{pname}-%{version}.tar.gz
|
Source0: http://mumps.enseeiht.fr/MUMPS_%{version}.tar.gz#/%{pname}-%{version}.tar.gz
|
||||||
Source1: Makefile.inc
|
Source1: Makefile.inc
|
||||||
Patch1: Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch
|
Patch1: Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user