r44588 - in /packages/fftw3/trunk/debian: changelog patches/fix-links.patch patches/series rules
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Wed Mar 21 22:46:34 UTC 2012
Author: jtaylor-guest
Date: Wed Mar 21 22:46:33 2012
New Revision: 44588
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44588
Log:
* debian/patches/fix-links.patch:
- Fix links of the thread and mpi library (Closes: #664531)
* debian/rules:
- pass MPILIBS=mpicc --showme:link to configure to ensure correct
mpi linkage
Added:
packages/fftw3/trunk/debian/patches/fix-links.patch
Modified:
packages/fftw3/trunk/debian/changelog
packages/fftw3/trunk/debian/patches/series
packages/fftw3/trunk/debian/rules
Modified: packages/fftw3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/changelog?rev=44588&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/changelog (original)
+++ packages/fftw3/trunk/debian/changelog Wed Mar 21 22:46:33 2012
@@ -1,3 +1,13 @@
+fftw3 (3.3.1-4) UNRELEASED; urgency=low
+
+ * debian/patches/fix-links.patch:
+ - Fix links of the thread and mpi library (Closes: #664531)
+ * debian/rules:
+ - pass MPILIBS=mpicc --showme:link to configure to ensure correct
+ mpi linkage
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Wed, 21 Mar 2012 23:04:11 +0100
+
fftw3 (3.3.1-3) experimental; urgency=low
* Add the multiarch support. Thanks to Julian Taylor for the patch
Added: packages/fftw3/trunk/debian/patches/fix-links.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/patches/fix-links.patch?rev=44588&op=file
==============================================================================
--- packages/fftw3/trunk/debian/patches/fix-links.patch (added)
+++ packages/fftw3/trunk/debian/patches/fix-links.patch Wed Mar 21 22:46:33 2012
@@ -1,0 +1,355 @@
+Description: link threads and mpi libraries against fftw3 and mpi
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Forwarded: fftw at fftw.org
+Applied-Upstream: 3.3.2
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,7 +14,7 @@
+ ACLOCAL_AMFLAGS=-I m4
+
+ SUBDIRS=support $(GENFFT) kernel simd-support dft rdft reodft api \
+-threads libbench2 . tests mpi doc tools m4
++libbench2 . threads tests mpi doc tools m4
+ EXTRA_DIST=COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in
+
+ SIMD_LIBS = \
+--- a/mpi/Makefile.am
++++ b/mpi/Makefile.am
+@@ -24,6 +24,7 @@
+ libfftw3 at PREC_SUFFIX@_mpi_la_SOURCES = $(SRC) $(TRANSPOSE_SRC) $(DFT_SRC) $(RDFT_SRC) $(RDFT2_SRC)
+
+ libfftw3 at PREC_SUFFIX@_mpi_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
++libfftw3 at PREC_SUFFIX@_mpi_la_LIBADD = ../libfftw3 at PREC_SUFFIX@.la @MPILIBS@
+
+ if THREADS
+ mpi_bench_CFLAGS = $(PTHREAD_CFLAGS)
+--- a/threads/Makefile.am
++++ b/threads/Makefile.am
+@@ -26,9 +26,11 @@
+ vrank-geq1-rdft2.c f77api.c f77funcs.h
+ libfftw3 at PREC_SUFFIX@_threads_la_CFLAGS = $(PTHREAD_CFLAGS)
+ libfftw3 at PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
++libfftw3 at PREC_SUFFIX@_threads_la_LIBADD = ../libfftw3 at PREC_SUFFIX@.la
+
+ libfftw3 at PREC_SUFFIX@_omp_la_SOURCES = api.c conf.c openmp.c \
+ threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \
+ vrank-geq1-rdft2.c f77api.c f77funcs.h
+ libfftw3 at PREC_SUFFIX@_omp_la_CFLAGS = $(OPENMP_CFLAGS)
+ libfftw3 at PREC_SUFFIX@_omp_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
++libfftw3 at PREC_SUFFIX@_omp_la_LIBADD = ../libfftw3 at PREC_SUFFIX@.la
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.2 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -82,12 +82,6 @@
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__uninstall_files_from_dir = { \
+- test -z "$$files" \
+- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+- $(am__cd) "$$dir" && rm -f $$files; }; \
+- }
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libfftw3 at PREC_SUFFIX@_la_DEPENDENCIES = kernel/libkernel.la \
+@@ -133,7 +127,7 @@
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = support genfft kernel simd-support dft rdft reodft api \
+- threads libbench2 . tests mpi doc tools m4
++ libbench2 . threads tests mpi doc tools m4
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -169,8 +163,6 @@
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
+-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -326,7 +318,7 @@
+ @MAINTAINER_MODE_TRUE at GENFFT = genfft
+ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = support $(GENFFT) kernel simd-support dft rdft reodft api \
+-threads libbench2 . tests mpi doc tools m4
++libbench2 . threads tests mpi doc tools m4
+
+ EXTRA_DIST = COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in
+ SIMD_LIBS = \
+@@ -378,7 +370,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+ .SUFFIXES:
+-am--refresh: Makefile
++am--refresh:
+ @:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+@@ -414,8 +406,10 @@
+ $(am__aclocal_m4_deps):
+
+ config.h: stamp-h1
+- @if test ! -f $@; then rm -f stamp-h1; else :; fi
+- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
++ @if test ! -f $@; then \
++ rm -f stamp-h1; \
++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
++ else :; fi
+
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+@@ -494,7 +488,9 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
++ test -n "$$files" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -703,7 +699,7 @@
+ $(am__remove_distdir)
+
+ dist-bzip2: distdir
+- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+ dist-lzma: distdir
+@@ -711,7 +707,7 @@
+ $(am__remove_distdir)
+
+ dist-xz: distdir
+- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
+ dist-tarZ: distdir
+@@ -761,7 +757,6 @@
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+@@ -790,16 +785,8 @@
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+- @test -n '$(distuninstallcheck_dir)' || { \
+- echo 'ERROR: trying to run $@ with an empty' \
+- '$$(distuninstallcheck_dir)' >&2; \
+- exit 1; \
+- }; \
+- $(am__cd) '$(distuninstallcheck_dir)' || { \
+- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+- exit 1; \
+- }; \
+- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
++ @$(am__cd) '$(distuninstallcheck_dir)' \
++ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+@@ -833,15 +820,10 @@
+
+ installcheck: installcheck-recursive
+ install-strip:
+- if test -z '$(STRIP)'; then \
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- install; \
+- else \
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+- fi
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+
+ clean-generic:
+--- a/mpi/Makefile.in
++++ b/mpi/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.2 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -79,16 +79,11 @@
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__uninstall_files_from_dir = { \
+- test -z "$$files" \
+- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+- $(am__cd) "$$dir" && rm -f $$files; }; \
+- }
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \
+ "$(DESTDIR)$(includedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libfftw3 at PREC_SUFFIX@_mpi_la_LIBADD =
++libfftw3 at PREC_SUFFIX@_mpi_la_DEPENDENCIES = \
++ ../libfftw3 at PREC_SUFFIX@.la
+ am__objects_1 = any-true.lo api.lo block.lo choose-radix.lo conf.lo \
+ dtensor.lo rearrange.lo wisdom-api.lo f03-wrap.lo
+ am__objects_2 = transpose-alltoall.lo transpose-pairwise.lo \
+@@ -304,6 +299,7 @@
+ SRC = any-true.c api.c block.c choose-radix.c conf.c dtensor.c fftw3-mpi.h ifftw-mpi.h rearrange.c wisdom-api.c f03-wrap.c
+ libfftw3 at PREC_SUFFIX@_mpi_la_SOURCES = $(SRC) $(TRANSPOSE_SRC) $(DFT_SRC) $(RDFT_SRC) $(RDFT2_SRC)
+ libfftw3 at PREC_SUFFIX@_mpi_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
++libfftw3 at PREC_SUFFIX@_mpi_la_LIBADD = ../libfftw3 at PREC_SUFFIX@.la @MPILIBS@
+ @OPENMP_TRUE@@THREADS_FALSE at mpi_bench_CFLAGS = $(OPENMP_CFLAGS)
+ @THREADS_TRUE at mpi_bench_CFLAGS = $(PTHREAD_CFLAGS)
+ @COMBINED_THREADS_FALSE@@THREADS_TRUE at LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3 at PREC_SUFFIX@_threads.la
+@@ -522,7 +518,9 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
++ test -n "$$files" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(includedir)" && rm -f $$files
+ install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+@@ -540,7 +538,9 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
++ test -n "$$files" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(includedir)" && rm -f $$files
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -645,15 +645,10 @@
+
+ installcheck: installcheck-am
+ install-strip:
+- if test -z '$(STRIP)'; then \
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- install; \
+- else \
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+- fi
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+
+ clean-generic:
+--- a/threads/Makefile.in
++++ b/threads/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.2 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -75,15 +75,10 @@
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__uninstall_files_from_dir = { \
+- test -z "$$files" \
+- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+- $(am__cd) "$$dir" && rm -f $$files; }; \
+- }
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+-libfftw3 at PREC_SUFFIX@_omp_la_LIBADD =
++libfftw3 at PREC_SUFFIX@_omp_la_DEPENDENCIES = \
++ ../libfftw3 at PREC_SUFFIX@.la
+ am_libfftw3 at PREC_SUFFIX@_omp_la_OBJECTS = \
+ libfftw3 at PREC_SUFFIX@_omp_la-api.lo \
+ libfftw3 at PREC_SUFFIX@_omp_la-conf.lo \
+@@ -105,7 +100,8 @@
+ @COMBINED_THREADS_FALSE@@OPENMP_TRUE@@THREADS_TRUE@ $(libdir)
+ @OPENMP_TRUE@@THREADS_FALSE at am_libfftw3@PREC_SUFFIX at _omp_la_rpath = \
+ @OPENMP_TRUE@@THREADS_FALSE@ -rpath $(libdir)
+-libfftw3 at PREC_SUFFIX@_threads_la_LIBADD =
++libfftw3 at PREC_SUFFIX@_threads_la_DEPENDENCIES = \
++ ../libfftw3 at PREC_SUFFIX@.la
+ am_libfftw3 at PREC_SUFFIX@_threads_la_OBJECTS = \
+ libfftw3 at PREC_SUFFIX@_threads_la-api.lo \
+ libfftw3 at PREC_SUFFIX@_threads_la-conf.lo \
+@@ -306,12 +302,14 @@
+
+ libfftw3 at PREC_SUFFIX@_threads_la_CFLAGS = $(PTHREAD_CFLAGS)
+ libfftw3 at PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
++libfftw3 at PREC_SUFFIX@_threads_la_LIBADD = ../libfftw3 at PREC_SUFFIX@.la
+ libfftw3 at PREC_SUFFIX@_omp_la_SOURCES = api.c conf.c openmp.c \
+ threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \
+ vrank-geq1-rdft2.c f77api.c f77funcs.h
+
+ libfftw3 at PREC_SUFFIX@_omp_la_CFLAGS = $(OPENMP_CFLAGS)
+ libfftw3 at PREC_SUFFIX@_omp_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
++libfftw3 at PREC_SUFFIX@_omp_la_LIBADD = ../libfftw3 at PREC_SUFFIX@.la
+ all: all-am
+
+ .SUFFIXES:
+@@ -668,15 +666,10 @@
+
+ installcheck: installcheck-am
+ install-strip:
+- if test -z '$(STRIP)'; then \
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- install; \
+- else \
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+- fi
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+
+ clean-generic:
Modified: packages/fftw3/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/patches/series?rev=44588&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/patches/series (original)
+++ packages/fftw3/trunk/debian/patches/series Wed Mar 21 22:46:33 2012
@@ -2,3 +2,4 @@
02_fftw-faq_bfnn.diff
03_fix_manpages.diff
04_improve_semaphore_detection.diff
+fix-links.patch
Modified: packages/fftw3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/rules?rev=44588&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/rules (original)
+++ packages/fftw3/trunk/debian/rules Wed Mar 21 22:46:33 2012
@@ -60,7 +60,7 @@
SETCFLAGS := CFLAGS='$(CFLAGS)'
# common configure options
-archconfflags := $(archconfflags) --prefix=/usr --enable-shared --enable-threads --enable-portable-binary --enable-mpi --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+archconfflags := $(archconfflags) --prefix=/usr --enable-shared --enable-threads --enable-portable-binary --enable-mpi --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) MPILIBS="$(shell mpicc --showme:link)"
build-arch:
# single precision
More information about the debian-science-commits
mailing list