tags 325813 patch thanks Hi James, Paul,
The attached patch incorporates the changed mpich build dependency, and also should fix the linkage of all the shared libraries in the package. Paul, I see from bug #263126 that you were planning an upload to fix the RC bug; hopefully this patch makes things easier for you. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u fftw-2.1.3/rfftw/Makefile.in fftw-2.1.3/rfftw/Makefile.in
--- fftw-2.1.3/rfftw/Makefile.in
+++ fftw-2.1.3/rfftw/Makefile.in
@@ -111,6 +111,7 @@
libXXX_FFTW_PREFIX_XXXrfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+libXXX_FFTW_PREFIX_XXXrfftw_la_LIBADD = ../fftw/libXXX_FFTW_PREFIX_XXXfftw.la
MAINTAINERCLEANFILES = $(CODELETS) rconfig.c
DISTCLEANFILES = srfftw.h drfftw.h
@@ -130,7 +131,8 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-libXXX_FFTW_PREFIX_XXXrfftw_la_LIBADD =
+libXXX_FFTW_PREFIX_XXXrfftw_la_DEPENDENCIES = \
+../fftw/libXXX_FFTW_PREFIX_XXXfftw.la
libXXX_FFTW_PREFIX_XXXrfftw_la_OBJECTS = frc_1.lo frc_2.lo frc_3.lo \
frc_4.lo frc_5.lo frc_6.lo frc_7.lo frc_8.lo frc_9.lo frc_10.lo \
frc_11.lo frc_12.lo frc_13.lo frc_14.lo frc_15.lo frc_16.lo frc_32.lo \
diff -u fftw-2.1.3/threads/Makefile.in fftw-2.1.3/threads/Makefile.in
--- fftw-2.1.3/threads/Makefile.in
+++ fftw-2.1.3/threads/Makefile.in
@@ -113,6 +113,8 @@
libXXX_FFTW_PREFIX_XXXfftw_threads_la_LDFLAGS =
-version-info @SHARED_VERSION_INFO@ -rpath
$(libdir)
+libXXX_FFTW_PREFIX_XXXfftw_threads_la_LIBADD =
$(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la -lpthread
+
fftw_threads_test_SOURCES = fftw_threads_test.c
fftw_threads_test_LDADD = ../tests/test_main.o
libXXX_FFTW_PREFIX_XXXfftw_threads.la
$(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la @THREADLIBS@
@@ -122,6 +124,8 @@
libXXX_FFTW_PREFIX_XXXrfftw_threads_la_LDFLAGS =
-version-info @SHARED_VERSION_INFO@ -rpath
$(libdir)
+libXXX_FFTW_PREFIX_XXXrfftw_threads_la_LIBADD =
libXXX_FFTW_PREFIX_XXXfftw_threads.la
$(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la
$(RFFTWDIR)/libXXX_FFTW_PREFIX_XXXrfftw.la -lpthread
+
CLEANFILES = XXX_FFTW_PREFIX1_XXXfftw_threads.h
XXX_FFTW_PREFIX1_XXXrfftw_threads.h
@@ -144,10 +148,14 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-libXXX_FFTW_PREFIX_XXXfftw_threads_la_LIBADD =
+libXXX_FFTW_PREFIX_XXXfftw_threads_la_DEPENDENCIES = \
+$(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la
libXXX_FFTW_PREFIX_XXXfftw_threads_la_OBJECTS = executor_threads.lo \
fftw_threads.lo fftwnd_threads.lo fftw_f77_threads.lo
-libXXX_FFTW_PREFIX_XXXrfftw_threads_la_LIBADD =
+libXXX_FFTW_PREFIX_XXXrfftw_threads_la_DEPENDENCIES = \
+libXXX_FFTW_PREFIX_XXXfftw_threads.la \
+$(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la \
+$(RFFTWDIR)/libXXX_FFTW_PREFIX_XXXrfftw.la
libXXX_FFTW_PREFIX_XXXrfftw_threads_la_OBJECTS = rexec_threads.lo \
rexec2_threads.lo rfftwnd_threads.lo rfftw_f77_threads.lo
noinst_PROGRAMS = @FFTW_THREADS_PROGLIST@
diff -u fftw-2.1.3/mpi/Makefile.in fftw-2.1.3/mpi/Makefile.in
--- fftw-2.1.3/mpi/Makefile.in
+++ fftw-2.1.3/mpi/Makefile.in
@@ -114,11 +114,15 @@
libXXX_FFTW_PREFIX_XXXfftw_mpi_la_LDFLAGS =
-version-info @SHARED_VERSION_INFO@ -rpath $(libdir)
+libXXX_FFTW_PREFIX_XXXfftw_mpi_la_LIBADD =
$(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la
+
libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_SOURCES =
rfftwnd_mpi.c XXX_FFTW_PREFIX_XXXrfftw_mpi.h rfftw_f77_mpi.c
libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_LDFLAGS =
-version-info @SHARED_VERSION_INFO@ -rpath $(libdir)
+libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_LIBADD =
libXXX_FFTW_PREFIX_XXXfftw_mpi.la
$(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la
$(RFFTWDIR)/libXXX_FFTW_PREFIX_XXXrfftw.la
+
CLEANFILES = XXX_FFTW_PREFIX1_XXXfftw_mpi.h XXX_FFTW_PREFIX1_XXXrfftw_mpi.h
@@ -152,10 +156,14 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-libXXX_FFTW_PREFIX_XXXfftw_mpi_la_LIBADD =
+libXXX_FFTW_PREFIX_XXXfftw_mpi_la_DEPENDENCIES = \
+$(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la
libXXX_FFTW_PREFIX_XXXfftw_mpi_la_OBJECTS = sched.lo TOMS_transpose.lo \
transpose_mpi.lo fftwnd_mpi.lo fftw_mpi.lo fftw_f77_mpi.lo
-libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_LIBADD =
+libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_DEPENDENCIES = \
+libXXX_FFTW_PREFIX_XXXfftw_mpi.la \
+$(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la \
+$(RFFTWDIR)/libXXX_FFTW_PREFIX_XXXrfftw.la
libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_OBJECTS = rfftwnd_mpi.lo \
rfftw_f77_mpi.lo
noinst_PROGRAMS = @FFTW_MPI_PROGLIST@
diff -u fftw-2.1.3/debian/changelog fftw-2.1.3/debian/changelog
--- fftw-2.1.3/debian/changelog
+++ fftw-2.1.3/debian/changelog
@@ -1,3 +1,12 @@
+fftw (2.1.3-16.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build-Depend on libmpich1.0-dev instead of mpich (closes: #333631).
+ * Fix missing dependencies on libmpich in the fftw_mpi libraries
+ (closes: #325813).
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Wed, 12 Oct 2005 18:16:50 -0700
+
fftw (2.1.3-16) unstable; urgency=low
* Reuploaded to allow compilation with gcc 3.3 which will help some arches.
diff -u fftw-2.1.3/debian/control fftw-2.1.3/debian/control
--- fftw-2.1.3/debian/control
+++ fftw-2.1.3/debian/control
@@ -2,7 +2,7 @@
Priority: optional
Maintainer: James A. Treacy <[EMAIL PROTECTED]>
Standards-Version: 3.5.8.0
-Build-Depends: mpich, g77
+Build-Depends: libmpich1.0-dev, g77
Package: fftw2
Architecture: any
diff -u fftw-2.1.3/debian/rules fftw-2.1.3/debian/rules
--- fftw-2.1.3/debian/rules
+++ fftw-2.1.3/debian/rules
@@ -37,8 +37,10 @@
cp fftw/fftw.h rfftw/rfftw.h threads/fftw_threads.h
threads/rfftw_threads.h \
mpi/fftw_mpi.h mpi/rfftw_mpi.h shared.d
# don't use mpicc to create the shared lib or the mpich static lib will
be included
- cd mpi && gcc -shared -Wl,-soname -Wl,libfftw_mpi.so.$(version_major)
-o .libs/libfftw_mpi.so.$(lib_version) sched.lo \
- TOMS_transpose.lo transpose_mpi.lo fftwnd_mpi.lo fftw_mpi.lo
+ cd mpi && gcc -shared -Wl,-soname -Wl,libfftw_mpi.so.$(version_major) \
+ -o .libs/libfftw_mpi.so.$(lib_version) sched.lo \
+ TOMS_transpose.lo transpose_mpi.lo fftwnd_mpi.lo fftw_mpi.lo \
+ -L/usr/lib/mpich/lib/shared -lmpich -L../fftw/.libs -lfftw
mv mpi/.libs/libfftw_mpi.so.$(lib_version)
mpi/.libs/librfftw_mpi.so.$(lib_version) shared.d
$(MAKE) clean
#
@@ -54,8 +56,10 @@
cp fftw/sfftw.h rfftw/srfftw.h threads/s*fftw_threads.h \
mpi/sfftw_mpi.h mpi/srfftw_mpi.h shared.s
# don't use mpicc to create the shared lib or the mpich static lib will
be included
- cd mpi && gcc -shared -Wl,-soname -Wl,libsfftw_mpi.so.$(version_major)
-o .libs/libsfftw_mpi.so.$(lib_version) sched.lo \
- TOMS_transpose.lo transpose_mpi.lo fftwnd_mpi.lo fftw_mpi.lo
+ cd mpi && gcc -shared -Wl,-soname -Wl,libsfftw_mpi.so.$(version_major) \
+ -o .libs/libsfftw_mpi.so.$(lib_version) sched.lo \
+ TOMS_transpose.lo transpose_mpi.lo fftwnd_mpi.lo fftw_mpi.lo \
+ -L/usr/lib/mpich/lib/shared -lmpich -L../fftw/.libs -lfftw
mv mpi/.libs/libsfftw_mpi.so.$(lib_version)
mpi/.libs/libsrfftw_mpi.so.$(lib_version) shared.s
$(MAKE) clean
only in patch2:
unchanged:
--- fftw-2.1.3.orig/rfftw/Makefile.am
+++ fftw-2.1.3/rfftw/Makefile.am
@@ -18,6 +18,7 @@
rfftw.h
libXXX_FFTW_PREFIX_XXXrfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+libXXX_FFTW_PREFIX_XXXrfftw_la_LIBADD = ../fftw/libXXX_FFTW_PREFIX_XXXfftw.la
MAINTAINERCLEANFILES = $(CODELETS) rconfig.c
DISTCLEANFILES = srfftw.h drfftw.h
only in patch2:
unchanged:
--- fftw-2.1.3.orig/threads/Makefile.am
+++ fftw-2.1.3/threads/Makefile.am
@@ -27,6 +27,8 @@
libXXX_FFTW_PREFIX_XXXfftw_threads_la_LDFLAGS = \
-version-info @SHARED_VERSION_INFO@ \
-rpath $(libdir)
+libXXX_FFTW_PREFIX_XXXfftw_threads_la_LIBADD = \
+ $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la -lpthread
XXX_FFTW_PREFIX1_XXXfftw_threads.h: fftw_threads.h
rm -f XXX_FFTW_PREFIX_XXXfftw_threads.h
@@ -48,6 +50,10 @@
libXXX_FFTW_PREFIX_XXXrfftw_threads_la_LDFLAGS = \
-version-info @SHARED_VERSION_INFO@ \
-rpath $(libdir)
+libXXX_FFTW_PREFIX_XXXrfftw_threads_la_LIBADD = \
+ libXXX_FFTW_PREFIX_XXXfftw_threads.la \
+ $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la \
+ $(RFFTWDIR)/libXXX_FFTW_PREFIX_XXXrfftw.la
-lpthread
XXX_FFTW_PREFIX1_XXXrfftw_threads.h: rfftw_threads.h
rm -f XXX_FFTW_PREFIX_XXXrfftw_threads.h
only in patch2:
unchanged:
--- fftw-2.1.3.orig/mpi/Makefile.am
+++ fftw-2.1.3/mpi/Makefile.am
@@ -27,6 +27,9 @@
libXXX_FFTW_PREFIX_XXXfftw_mpi_la_LDFLAGS = \
-version-info @SHARED_VERSION_INFO@ \
-rpath $(libdir)
+libXXX_FFTW_PREFIX_XXXfftw_mpi_la_LIBADD = \
+ $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la
+
XXX_FFTW_PREFIX1_XXXfftw_mpi.h: fftw_mpi.h
rm -f XXX_FFTW_PREFIX_XXXfftw_mpi.h
@@ -38,6 +41,9 @@
libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_LDFLAGS = \
-version-info @SHARED_VERSION_INFO@ \
-rpath $(libdir)
+libXXX_FFTW_PREFIX_XXXrfftw_mpi_la_LIBADD = \
+ libXXX_FFTW_PREFIX_XXXfftw_mpi.la \
+ $(FFTWDIR)/libXXX_FFTW_PREFIX_XXXfftw.la
$(RFFTWDIR)/libXXX_FFTW_PREFIX_XXXrfftw.la
XXX_FFTW_PREFIX1_XXXrfftw_mpi.h: rfftw_mpi.h
rm -f XXX_FFTW_PREFIX_XXXrfftw_mpi.h
only in patch2:
unchanged:
--- fftw-2.1.3.orig/gensrc/Makefile.rfftw.am
+++ fftw-2.1.3/gensrc/Makefile.rfftw.am
@@ -18,6 +18,7 @@
rfftw.h
libXXX_FFTW_PREFIX_XXXrfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+libXXX_FFTW_PREFIX_XXXrfftw_la_LIBADD = ../fftw/libXXX_FFTW_PREFIX_XXXfftw.la
MAINTAINERCLEANFILES = $(CODELETS) rconfig.c
DISTCLEANFILES = srfftw.h drfftw.h
signature.asc
Description: Digital signature
