From 5ee91b1ef905bd04c010d0d0fb49cb223d07180f2a3eb5e48b788d4821389d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 26 Apr 2012 11:37:17 +0000 Subject: [PATCH] Accepting request 115693 from openSUSE:Factory:ARM fix arm build OBS-URL: https://build.opensuse.org/request/show/115693 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=32 --- fftw3.changes | 7 +++++++ fftw3.spec | 18 ++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/fftw3.changes b/fftw3.changes index 1ac7b95..003cfec 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 26 04:26:02 UTC 2012 - adrian@suse.de + +- fix build on %arm + * disable neon it would require --enable-single (precision) +- enable openmpi for %arm + ------------------------------------------------------------------- Fri Mar 16 01:17:58 UTC 2012 - alinm.elena@gmail.com diff --git a/fftw3.spec b/fftw3.spec index 724d472..200a426 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -20,7 +20,7 @@ Name: fftw3 BuildRequires: fdupes BuildRequires: gcc-fortran BuildRequires: pkgconfig -%ifnarch s390 s390x %arm +%ifnarch s390 s390x BuildRequires: openmpi-devel %endif Version: 3.3.1 @@ -114,7 +114,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 %arm +%ifnarch s390 s390x %package -n libfftw3_mpi3 Summary: Discrete Fourier Transform (DFT) C subroutine library @@ -149,18 +149,15 @@ data, and of arbitrary input size. %patch0 %build -%ifnarch s390 s390x %arm +%ifnarch s390 s390x source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh %endif %configure --enable-shared --enable-threads --enable-openmp \ -%ifnarch s390 s390x %arm +%ifnarch s390 s390x --enable-mpi \ %endif %ifarch %ix86 x86_64 --enable-sse2 \ -%endif -%ifarch %arm - --enable-neon \ %endif --disable-static make %{?_smp_mflags} @@ -174,18 +171,15 @@ rm -f %{buildroot}%{_libdir}/lib*.*a # hack to also compile/install single-precision version: make distclean -%ifnarch s390 s390x %arm +%ifnarch s390 s390x source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh %endif %configure --enable-shared --enable-threads --enable-float --enable-openmp \ -%ifnarch s390 s390x %arm +%ifnarch s390 s390x --enable-mpi \ %endif %ifarch %ix86 x86_64 --enable-sse \ -%endif -%ifarch %arm - --enable-neon \ %endif --disable-static