forked from pool/fftw3
Accepting request 579040 from home:NMoreyChaisemartin:branches:science:HPC
- Switch to openmpi2 instead of openmpi (bsc#1082302), apart from ppc64 as openmpi2 does not support it. OBS-URL: https://build.opensuse.org/request/show/579040 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=64
This commit is contained in:
parent
88dad9614a
commit
2b9b328d12
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 22 15:02:28 UTC 2018 - nmoreychaisemartin@suse.com
|
||||||
|
|
||||||
|
- Switch to openmpi2 instead of openmpi (bsc#1082302),
|
||||||
|
apart from ppc64 as openmpi2 does not support it.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 22 16:14:42 UTC 2018 - eich@suse.com
|
Mon Jan 22 16:14:42 UTC 2018 - eich@suse.com
|
||||||
|
|
||||||
|
17
fftw3.spec
17
fftw3.spec
@ -25,6 +25,13 @@
|
|||||||
%define _ver 3_3_6
|
%define _ver 3_3_6
|
||||||
%define pl_ext pl2
|
%define pl_ext pl2
|
||||||
|
|
||||||
|
#For non HPC builds only
|
||||||
|
%ifarch ppc64
|
||||||
|
%define mpi_implem openmpi
|
||||||
|
%else
|
||||||
|
%define mpi_implem openmpi2
|
||||||
|
%endif
|
||||||
|
|
||||||
%bcond_with ringdisabled
|
%bcond_with ringdisabled
|
||||||
|
|
||||||
%if 0%{?is_opensuse} || 0%{?is_backports}
|
%if 0%{?is_opensuse} || 0%{?is_backports}
|
||||||
@ -197,7 +204,7 @@ BuildRequires: gcc-c++
|
|||||||
BuildRequires: gcc-fortran
|
BuildRequires: gcc-fortran
|
||||||
Requires: %{package_name}-libs = %{version}
|
Requires: %{package_name}-libs = %{version}
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
BuildRequires: openmpi-devel
|
BuildRequires: %{mpi_implem}-devel
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -321,10 +328,10 @@ data, and of arbitrary input size.
|
|||||||
%package mpi-devel
|
%package mpi-devel
|
||||||
Summary: Discrete Fourier Transform (DFT) C subroutine library
|
Summary: Discrete Fourier Transform (DFT) C subroutine library
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
|
Requires: %{mpi_implem}-devel
|
||||||
Requires: fftw3-devel = %{version}
|
Requires: fftw3-devel = %{version}
|
||||||
Requires: glibc-devel
|
Requires: glibc-devel
|
||||||
Requires: libfftw3_mpi3 = %{version}-%{release}
|
Requires: libfftw3_mpi3 = %{version}-%{release}
|
||||||
Requires: openmpi-devel
|
|
||||||
|
|
||||||
%description mpi-devel
|
%description mpi-devel
|
||||||
FFTW is a C subroutine library for computing the Discrete Fourier
|
FFTW is a C subroutine library for computing the Discrete Fourier
|
||||||
@ -350,7 +357,7 @@ EOF
|
|||||||
%endif
|
%endif
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
%if "%{mpi_flavor}" == "standard"
|
%if "%{mpi_flavor}" == "standard"
|
||||||
source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
|
source %_libdir/mpi/gcc/%{mpi_implem}/bin/mpivars.sh
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -390,7 +397,7 @@ make distclean
|
|||||||
|
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
%if "%{mpi_flavor}" == "standard"
|
%if "%{mpi_flavor}" == "standard"
|
||||||
source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
|
source %_libdir/mpi/gcc/%{mpi_implem}/bin/mpivars.sh
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -418,7 +425,7 @@ make distclean
|
|||||||
|
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
%if "%{mpi_flavor}" == "standard"
|
%if "%{mpi_flavor}" == "standard"
|
||||||
source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
|
source %_libdir/mpi/gcc/%{mpi_implem}/bin/mpivars.sh
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%if %{without hpc}
|
%if %{without hpc}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user