From 574966b25d728cd3e96a6eed29051d41cdec0b623639e833747c5f8402bedc7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 28 Nov 2011 09:51:22 +0000 Subject: [PATCH] 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 --- fftw3.changes | 5 +++++ fftw3.spec | 26 +++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/fftw3.changes b/fftw3.changes index ec18695..73c2ac3 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -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 diff --git a/fftw3.spec b/fftw3.spec index 2416a2e..741c96f 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -18,7 +18,10 @@ 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 Version: 3.3 Release: 14 @@ -26,7 +29,7 @@ License: GPLv2+ Group: Productivity/Scientific/Math Source: fftw-%{version}.tar.bz2 # Patch: fftw-%{version}.diff -URL: http://www.fftw.org +Url: http://www.fftw.org AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 data, and of arbitrary input size. +%ifnarch s390 s390x %package -n libfftw3_mpi3 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 Transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. - +%endif %prep %setup -q -n fftw-%{version} @@ -140,7 +144,10 @@ data, and of arbitrary input size. # autoreconf --force --install %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 --enable-sse2 \ %endif @@ -153,7 +160,10 @@ make %{?_smp_mflags} rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a # hack to also compile/install single-precision version: 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 --enable-sse \ %endif @@ -186,9 +196,12 @@ find doc -name 'Makefile*' | xargs rm %postun -n libfftw3_omp3 -p /sbin/ldconfig +%ifnarch s390 s390x + %post -n libfftw3_mpi3 -p /sbin/ldconfig %postun -n libfftw3_mpi3 -p /sbin/ldconfig +%endif %files -n libfftw3-3 %defattr(-,root,root) @@ -227,6 +240,8 @@ find doc -name 'Makefile*' | xargs rm %{_libdir}/libfftw3_omp.so %{_libdir}/libfftw3f_omp.so +%ifnarch s390 s390x + %files -n libfftw3_mpi3 %defattr(-,root,root) %{_libdir}/libfftw3_mpi.so.3* @@ -237,5 +252,6 @@ find doc -name 'Makefile*' | xargs rm %{_libdir}/libfftw3_mpi.so %{_libdir}/libfftw3f_mpi.so %{_includedir}/fftw3-mpi.* +%endif %changelog