A couple of gsl-1.6 patches which make it compile/run more cleanly.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4236

diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index 3c84a2d9841834b1489e83018f0901d9733a247f..5a0f7a0d2499d8a4a0f290244fd3e4637b4c2dba 100644 (file)
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -3,7 +3,8 @@ include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
 
 bin_PROGRAMS = valgrind-listener
 
-noinst_SCRIPTS = gen-mdg DotToScc.hs gsl16test
+noinst_SCRIPTS = gen-mdg DotToScc.hs \
+               gsl16test gsl16-badfree.patch gsl16-wavelet.patch
 
 EXTRA_DIST = $(noinst_SCRIPTS)
 

diff --git a/auxprogs/gsl16-badfree.patch b/auxprogs/gsl16-badfree.patch
new file mode 100644 (file)
index 0000000..d07d3a1
--- /dev/null
+++ b/auxprogs/gsl16-badfree.patch
@@ -0,0 +1,32 @@
+Index: test_complex_source.c
+===================================================================
+RCS file: /home/gsl-cvs/gsl/vector/test_complex_source.c,v
+retrieving revision 1.23
+diff -u -r1.23 test_complex_source.c
+--- test_complex_source.c       24 Jun 2005 11:33:25 -0000      1.23
++++ test_complex_source.c       6 Jul 2005 11:18:33 -0000
+@@ -75,7 +75,7 @@
+   if (stride == 1)
+     {
+       v0 = FUNCTION (gsl_vector, alloc) (N);
+-      view = FUNCTION (gsl_vector, subvector) (v, 0, N);
++      view = FUNCTION (gsl_vector, subvector) (v0, 0, N);
+       v = &view.vector;
+     }
+   else
+Index: test_source.c
+===================================================================
+RCS file: /home/gsl-cvs/gsl/vector/test_source.c,v
+retrieving revision 1.26
+diff -u -r1.26 test_source.c
+--- test_source.c       24 Jun 2005 11:33:26 -0000      1.26
++++ test_source.c       6 Jul 2005 11:14:18 -0000
+@@ -75,7 +75,7 @@
+   if (stride == 1)
+     {
+       v0 = FUNCTION (gsl_vector, alloc) (N);
+-      view = FUNCTION (gsl_vector, subvector) (v, 0, N);
++      view = FUNCTION (gsl_vector, subvector) (v0, 0, N);
+       v = &view.vector;
+     }
+   else

diff --git a/auxprogs/gsl16-wavelet.patch b/auxprogs/gsl16-wavelet.patch
new file mode 100644 (file)
index 0000000..525e9cf
--- /dev/null
+++ b/auxprogs/gsl16-wavelet.patch
@@ -0,0 +1,11 @@
+--- wavelet/dwt.c~      2004-12-24 14:57:34.000000000 +0100
++++ wavelet/dwt.c       2005-07-08 23:31:32.000000000 +0200
+@@ -30,7 +30,7 @@
+
+ static int binary_logn (const size_t n);
+ static void dwt_step (const gsl_wavelet * w, double *a, size_t stride,
+-                      size_t n, int isign, gsl_wavelet_workspace * work);
++                      size_t n, gsl_wavelet_direction dir, gsl_wavelet_workspace * work);
+
+ static int
+ binary_logn (const size_t n)