Accepting request 109624 from home:dimstar:gcc47

- source the mpi environment (forwarded request 109612 from ealin)

OBS-URL: https://build.opensuse.org/request/show/109624
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=30
This commit is contained in:
Dave Plater 2012-03-16 09:50:56 +00:00 committed by Git OBS Bridge
parent ebf7a8a0d7
commit d19cb8f9ea
2 changed files with 15 additions and 4 deletions

View File

@ -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 Tue Mar 6 14:16:22 UTC 2012 - dhall@wustl.edu

View File

@ -16,7 +16,6 @@
# #
Name: fftw3 Name: fftw3
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-fortran BuildRequires: gcc-fortran
@ -26,10 +25,10 @@ BuildRequires: openmpi-devel
%endif %endif
Version: 3.3.1 Version: 3.3.1
Release: 0 Release: 0
License: GPL-2.0+
Summary: Discrete Fourier Transform (DFT) C Subroutine Library Summary: Discrete Fourier Transform (DFT) C Subroutine Library
Url: http://www.fftw.org License: GPL-2.0+
Group: Productivity/Scientific/Math Group: Productivity/Scientific/Math
Url: http://www.fftw.org
Source: http://www.fftw.org/fftw-%{version}.tar.gz Source: http://www.fftw.org/fftw-%{version}.tar.gz
Source1: %{name}-rpmlintrc Source1: %{name}-rpmlintrc
Patch0: 1_man_macro.patch Patch0: 1_man_macro.patch
@ -44,8 +43,8 @@ data, and of arbitrary input size.
%package devel %package devel
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libfftw3-3 = %{version}-%{release}
Requires: glibc-devel Requires: glibc-devel
Requires: libfftw3-3 = %{version}-%{release}
Provides: fftw-devel Provides: fftw-devel
%description devel %description devel
@ -150,6 +149,9 @@ data, and of arbitrary input size.
%patch0 %patch0
%build %build
%ifnarch s390 s390x %arm
source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
%endif
%configure --enable-shared --enable-threads --enable-openmp \ %configure --enable-shared --enable-threads --enable-openmp \
%ifnarch s390 s390x %arm %ifnarch s390 s390x %arm
--enable-mpi \ --enable-mpi \
@ -171,6 +173,10 @@ rm -f %{buildroot}%{_libdir}/lib*.*a
# hack to also compile/install single-precision version: # hack to also compile/install single-precision version:
make distclean make distclean
%ifnarch s390 s390x %arm
source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
%endif
%configure --enable-shared --enable-threads --enable-float --enable-openmp \ %configure --enable-shared --enable-threads --enable-float --enable-openmp \
%ifnarch s390 s390x %arm %ifnarch s390 s390x %arm
--enable-mpi \ --enable-mpi \