The attached patch switches the Build-Depends from libmpich1.0-dev to
mpi-default-dev. The additional "CC=mpicc" entries ensure correct linking --
the original fftw makefiles assume that "-lmpi" is all the linking they need
for MPI, but the newer implementations need additional libraries that mpicc
enumerates properly.
--
Nicholas Breen
nbr...@ofb.net
diff -Nru fftw-2.1.3_orig/debian/control fftw-2.1.3/debian/control
--- fftw-2.1.3_orig/debian/control 2011-05-10 19:17:57.000000000 -0700
+++ fftw-2.1.3/debian/control 2011-05-10 19:18:54.312346690 -0700
@@ -2,7 +2,7 @@
Section: oldlibs
Priority: extra
Maintainer: Paul Brossier <p...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, autoconf, automake, dpatch, libtool, libmpich1.0-dev, gfortran
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, autoconf, automake, dpatch, libtool, mpi-defaults-dev, gfortran
Build-Conflicts: autoconf2.13, automake1.4
Standards-Version: 3.7.3
@@ -10,7 +10,7 @@
Architecture: any
Section: oldlibs
Depends: ${shlibs:Depends}
-Suggests: fftw-dev, mpich-bin
+Suggests: fftw-dev, mpi-defaults-bin
Provides: fftw2-double
Conflicts: fftw2-double
Description: library for computing Fast Fourier Transforms
@@ -36,7 +36,7 @@
Architecture: any
Section: oldlibs
Depends: ${shlibs:Depends}
-Suggests: sfftw-dev, mpich-bin
+Suggests: sfftw-dev, mpi-defaults-bin
Provides: fftw2-single
Conflicts: fftw2-single, fftw2 (<= 2.1.3-10)
Description: library for computing Fast Fourier Transforms
diff -Nru fftw-2.1.3_orig/debian/rules fftw-2.1.3/debian/rules
--- fftw-2.1.3_orig/debian/rules 2011-05-10 19:17:57.000000000 -0700
+++ fftw-2.1.3/debian/rules 2011-05-10 19:30:42.516078892 -0700
@@ -14,7 +14,7 @@
CFLAGS += -O2
endif
-CONFFLAGS := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-shared --enable-mpi --enable-threads
+CONFFLAGS := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-shared --enable-mpi --enable-threads
ifeq ($(ARCHITECTURE), i386)
ARCHCONFFLAGS := --enable-i386-hacks
@@ -30,7 +30,7 @@
build-arch-stamp: autoreconf-stamp
dh_testdir
# single precision
- F77=gfortran CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) --enable-float --enable-type-prefix $(ARCHCONFFLAGS)
+ F77=gfortran CFLAGS="$(CFLAGS)" CC=mpicc ./configure $(CONFFLAGS) --enable-float --enable-type-prefix $(ARCHCONFFLAGS)
$(MAKE)
#$(MAKE) -C tests check
./tests/fftw_test -t -e -v -p 1024 -x 1
@@ -38,7 +38,7 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-single
$(MAKE) clean
# double precision
- F77=gfortran CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) $(ARCHCONFFLAGS)
+ F77=gfortran CFLAGS="$(CFLAGS)" CC=mpicc ./configure $(CONFFLAGS) $(ARCHCONFFLAGS)
$(MAKE)
#$(MAKE) -C tests check
./tests/fftw_test -t -e -v -p 1024 -x 1
