diff --git a/fftw3.changes b/fftw3.changes index 76631f7..1ac7b95 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 16 01:17:58 UTC 2012 - alinm.elena@gmail.com + +- source the mpi environment + ------------------------------------------------------------------- Tue Mar 6 14:16:22 UTC 2012 - dhall@wustl.edu diff --git a/fftw3.spec b/fftw3.spec index b99a2fc..724d472 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -16,7 +16,6 @@ # - Name: fftw3 BuildRequires: fdupes BuildRequires: gcc-fortran @@ -26,10 +25,10 @@ BuildRequires: openmpi-devel %endif Version: 3.3.1 Release: 0 -License: GPL-2.0+ Summary: Discrete Fourier Transform (DFT) C Subroutine Library -Url: http://www.fftw.org +License: GPL-2.0+ Group: Productivity/Scientific/Math +Url: http://www.fftw.org Source: http://www.fftw.org/fftw-%{version}.tar.gz Source1: %{name}-rpmlintrc Patch0: 1_man_macro.patch @@ -44,8 +43,8 @@ data, and of arbitrary input size. %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: libfftw3-3 = %{version}-%{release} Requires: glibc-devel +Requires: libfftw3-3 = %{version}-%{release} Provides: fftw-devel %description devel @@ -150,6 +149,9 @@ data, and of arbitrary input size. %patch0 %build +%ifnarch s390 s390x %arm +source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh +%endif %configure --enable-shared --enable-threads --enable-openmp \ %ifnarch s390 s390x %arm --enable-mpi \ @@ -171,6 +173,10 @@ rm -f %{buildroot}%{_libdir}/lib*.*a # hack to also compile/install single-precision version: make distclean + +%ifnarch s390 s390x %arm +source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh +%endif %configure --enable-shared --enable-threads --enable-float --enable-openmp \ %ifnarch s390 s390x %arm --enable-mpi \