summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/fftw/files')
-rw-r--r--sci-libs/fftw/files/fftw-2.1.5-as-needed.patch16
-rw-r--r--sci-libs/fftw/files/fftw-2.1.5-configure.in.patch4
-rw-r--r--sci-libs/fftw/files/fftw-2.1.5-no-test.patch12
3 files changed, 16 insertions, 16 deletions
diff --git a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch
index 2389f0e43f7..63f46dccc4f 100644
--- a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch
+++ b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch
@@ -1,5 +1,5 @@
---- rfftw/Makefile.am.orig 2008-04-03 15:23:06.989019659 +0000
-+++ rfftw/Makefile.am 2008-04-03 15:23:35.658653448 +0000
+--- a/rfftw/Makefile.am
++++ b/rfftw/Makefile.am
@@ -18,6 +18,7 @@
rfftw.h
@@ -8,8 +8,8 @@
MAINTAINERCLEANFILES = $(CODELETS) rconfig.c
DISTCLEANFILES = srfftw.h drfftw.h
---- threads/Makefile.am.orig 2008-04-03 15:23:10.101197011 +0000
-+++ threads/Makefile.am 2008-04-03 15:23:35.662653676 +0000
+--- a/threads/Makefile.am
++++ b/threads/Makefile.am
@@ -28,6 +28,10 @@
-version-info @SHARED_VERSION_INFO@ \
-rpath $(libdir)
@@ -33,8 +33,8 @@
@FFTW_PREFIX1@rfftw_threads.h: rfftw_threads.h
rm -f $@
sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_threads.h > $@
---- mpi/Makefile.am.orig 2008-04-03 15:22:43.811698858 +0000
-+++ mpi/Makefile.am 2008-04-03 15:25:50.930362143 +0000
+--- a/mpi/Makefile.am
++++ b/mpi/Makefile.am
@@ -28,6 +28,9 @@
-version-info @SHARED_VERSION_INFO@ \
-rpath $(libdir)
@@ -92,8 +92,8 @@
# for some reason, automake tries to use autoheader in order to
# generate config.h.in, and fails because config.h.in is GNU-lly
---- mpi/test_sched.c.orig 2008-04-03 16:58:01.969033125 +0000
-+++ mpi/test_sched.c 2008-04-03 16:59:27.521908505 +0000
+--- a/mpi/test_sched.c
++++ b/mpi/test_sched.c
@@ -27,6 +27,8 @@
int **sched;
int npes = -1, sortpe = -1, steps;
diff --git a/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch b/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch
index 718e74686f6..7abe3e751d5 100644
--- a/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch
+++ b/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch
@@ -1,5 +1,5 @@
---- configure.in.orig 2008-07-09 17:52:16.762461233 +0100
-+++ configure.in 2008-07-09 18:34:13.106471656 +0100
+--- a/configure.in
++++ b/configure.in
@@ -1,6 +1,8 @@
+
dnl Process this file with autoconf to produce a configure script.
diff --git a/sci-libs/fftw/files/fftw-2.1.5-no-test.patch b/sci-libs/fftw/files/fftw-2.1.5-no-test.patch
index f9f54f68eb1..cc844a455e6 100644
--- a/sci-libs/fftw/files/fftw-2.1.5-no-test.patch
+++ b/sci-libs/fftw/files/fftw-2.1.5-no-test.patch
@@ -1,13 +1,13 @@
---- tests/Makefile.am.orig 2008-06-22 12:29:53.149138283 +0100
-+++ tests/Makefile.am 2008-06-22 12:30:32.731595087 +0100
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = fftw_test rfftw_test
+check_PROGRAMS = fftw_test rfftw_test
noinst_HEADERS = test_main.h
FFTWDIR=../fftw
---- mpi/Makefile.am.orig 2008-06-22 17:21:16.998466390 +0100
-+++ mpi/Makefile.am 2008-06-22 17:27:42.996463162 +0100
+--- a/mpi/Makefile.am
++++ b/mpi/Makefile.am
@@ -4,8 +4,8 @@
lib_LTLIBRARIES = @FFTW_MPI_LIBLIST@
@@ -18,8 +18,8 @@
EXTRA_LTLIBRARIES = lib@FFTW_PREFIX@fftw_mpi.la \
lib@FFTW_PREFIX@rfftw_mpi.la
EXTRA_HEADERS = @FFTW_PREFIX@fftw_mpi.h @FFTW_PREFIX@rfftw_mpi.h
---- threads/Makefile.am.orig 2008-06-22 17:18:18.940409610 +0100
-+++ threads/Makefile.am 2008-06-22 17:28:00.485459803 +0100
+--- a/threads/Makefile.am
++++ b/threads/Makefile.am
@@ -4,9 +4,9 @@
lib_LTLIBRARIES = @FFTW_THREADS_LIBLIST@