- up to 5.0.88

[packages/mysql.git] / mysql-c++.patch

diff --git a/mysql-c++.patch b/mysql-c++.patch
index 462aa1deea93dd6cbd3db0dafe7ad642d0d14cb4..2abe3d5f902ddcc0b9145c0611a6a650ed91051a 100644 (file)
--- a/mysql-c++.patch
+++ b/mysql-c++.patch
@@ -1,24 +1,12 @@
-diff -Nru mysql-3.23.54a.orig/isam/Makefile.am mysql-3.23.54a/isam/Makefile.am
---- mysql-3.23.54a.orig/isam/Makefile.am       Thu Dec  5 10:37:06 2002
-+++ mysql-3.23.54a/isam/Makefile.am    Fri Jan 17 14:42:23 2003
-@@ -16,7 +16,7 @@
- 
- INCLUDES =            @MT_INCLUDES@ -I$(srcdir)/../include -I../include 
- LDADD =                       @CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \
--                      ../dbug/libdbug.a ../strings/libmystrings.a
-+                      ../dbug/libdbug.a ../strings/libmystrings.a -lstdc++
- pkglib_LIBRARIES =    libnisam.a
- bin_PROGRAMS =                isamchk isamlog pack_isam
- isamchk_DEPENDENCIES= $(LIBRARIES)
-diff -Nru mysql-3.23.54a.orig/myisam/Makefile.am mysql-3.23.54a/myisam/Makefile.am
---- mysql-3.23.54a.orig/myisam/Makefile.am     Thu Dec  5 10:37:04 2002
-+++ mysql-3.23.54a/myisam/Makefile.am  Fri Jan 17 14:42:41 2003
-@@ -19,7 +19,7 @@
- 
- INCLUDES =            @MT_INCLUDES@ -I$(srcdir)/../include -I../include 
- LDADD =                       @CLIENT_EXTRA_LDFLAGS@ libmyisam.a ../mysys/libmysys.a \
--                      ../dbug/libdbug.a ../strings/libmystrings.a
-+                      ../dbug/libdbug.a ../strings/libmystrings.a -lstdc++
+diff -ur mysql-4.1.7.org/myisam/Makefile.am mysql-4.1.7/myisam/Makefile.am
+--- mysql-4.1.7.org/myisam/Makefile.am 2004-10-27 01:35:55.000000000 +0200
++++ mysql-4.1.7/myisam/Makefile.am     2004-10-27 01:41:47.764533080 +0200
+@@ -21,7 +21,7 @@
+ LDADD =                       @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+                       $(top_builddir)/mysys/libmysys.a \
+                       $(top_builddir)/dbug/libdbug.a \
+-                      $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
++                      $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ $(libdir)/libsupc++.la
  pkglib_LIBRARIES =    libmyisam.a
- bin_PROGRAMS =                myisamchk myisamlog myisampack
+ bin_PROGRAMS =                myisamchk myisamlog myisampack myisam_ftdump
  myisamchk_DEPENDENCIES=       $(LIBRARIES)