Accepting request 93908 from home:oertel:branches:openSUSE:Factory

- fix build on s390/s390x without openmpi

OBS-URL: https://build.opensuse.org/request/show/93908
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=18
This commit is contained in:
Ismail Dönmez 2011-11-28 09:51:22 +00:00 committed by Git OBS Bridge
parent 6ad7bad6c2
commit 574966b25d
2 changed files with 26 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 28 01:48:17 CET 2011 - ro@suse.de
- fix build on s390/s390x without openmpi
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 21 17:45:00 UTC 2011 - jengelh@medozas.de Mon Nov 21 17:45:00 UTC 2011 - jengelh@medozas.de

View File

@ -18,7 +18,10 @@
Name: fftw3 Name: fftw3
BuildRequires: fdupes gcc-fortran openmpi-devel pkgconfig BuildRequires: fdupes gcc-fortran pkgconfig
%ifnarch s390 s390x
BuildRequires: openmpi-devel
%endif
Summary: Discrete Fourier Transform (DFT) C Subroutine Library Summary: Discrete Fourier Transform (DFT) C Subroutine Library
Version: 3.3 Version: 3.3
Release: 14 Release: 14
@ -26,7 +29,7 @@ License: GPLv2+
Group: Productivity/Scientific/Math Group: Productivity/Scientific/Math
Source: fftw-%{version}.tar.bz2 Source: fftw-%{version}.tar.bz2
# Patch: fftw-%{version}.diff # Patch: fftw-%{version}.diff
URL: http://www.fftw.org Url: http://www.fftw.org
AutoReqProv: on AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): %install_info_prereq Requires(pre): %install_info_prereq
@ -107,6 +110,7 @@ FFTW is a C subroutine library for computing the Discrete Fourier
Transform (DFT) in one or more dimensions, of both real and complex Transform (DFT) in one or more dimensions, of both real and complex
data, and of arbitrary input size. data, and of arbitrary input size.
%ifnarch s390 s390x
%package -n libfftw3_mpi3 %package -n libfftw3_mpi3
Summary: Discrete Fourier Transform (DFT) C subroutine library Summary: Discrete Fourier Transform (DFT) C subroutine library
@ -132,7 +136,7 @@ Requires: openmpi-devel
FFTW is a C subroutine library for computing the Discrete Fourier FFTW is a C subroutine library for computing the Discrete Fourier
Transform (DFT) in one or more dimensions, of both real and complex Transform (DFT) in one or more dimensions, of both real and complex
data, and of arbitrary input size. data, and of arbitrary input size.
%endif
%prep %prep
%setup -q -n fftw-%{version} %setup -q -n fftw-%{version}
@ -140,7 +144,10 @@ data, and of arbitrary input size.
# autoreconf --force --install # autoreconf --force --install
%build %build
%configure --enable-shared --enable-threads --enable-openmp --enable-mpi \ %configure --enable-shared --enable-threads --enable-openmp \
%ifnarch s390 s390x
--enable-mpi \
%endif
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
--enable-sse2 \ --enable-sse2 \
%endif %endif
@ -153,7 +160,10 @@ make %{?_smp_mflags}
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
# hack to also compile/install single-precision version: # hack to also compile/install single-precision version:
make distclean make distclean
%configure --enable-shared --enable-threads --enable-float --enable-openmp --enable-mpi \ %configure --enable-shared --enable-threads --enable-float --enable-openmp \
%ifnarch s390 s390x
--enable-mpi \
%endif
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
--enable-sse \ --enable-sse \
%endif %endif
@ -186,9 +196,12 @@ find doc -name 'Makefile*' | xargs rm
%postun -n libfftw3_omp3 -p /sbin/ldconfig %postun -n libfftw3_omp3 -p /sbin/ldconfig
%ifnarch s390 s390x
%post -n libfftw3_mpi3 -p /sbin/ldconfig %post -n libfftw3_mpi3 -p /sbin/ldconfig
%postun -n libfftw3_mpi3 -p /sbin/ldconfig %postun -n libfftw3_mpi3 -p /sbin/ldconfig
%endif
%files -n libfftw3-3 %files -n libfftw3-3
%defattr(-,root,root) %defattr(-,root,root)
@ -227,6 +240,8 @@ find doc -name 'Makefile*' | xargs rm
%{_libdir}/libfftw3_omp.so %{_libdir}/libfftw3_omp.so
%{_libdir}/libfftw3f_omp.so %{_libdir}/libfftw3f_omp.so
%ifnarch s390 s390x
%files -n libfftw3_mpi3 %files -n libfftw3_mpi3
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libfftw3_mpi.so.3* %{_libdir}/libfftw3_mpi.so.3*
@ -237,5 +252,6 @@ find doc -name 'Makefile*' | xargs rm
%{_libdir}/libfftw3_mpi.so %{_libdir}/libfftw3_mpi.so
%{_libdir}/libfftw3f_mpi.so %{_libdir}/libfftw3f_mpi.so
%{_includedir}/fftw3-mpi.* %{_includedir}/fftw3-mpi.*
%endif
%changelog %changelog