- release 1.9 - consider bunping to rel 2 and rebuild with fixed init.

[packages/mysql.git] / mysql-libs.patch

diff --git a/mysql-libs.patch b/mysql-libs.patch
index 471aaebe330c8b577d41b5c4602650c099c8507c..4acd696feca26cf0fdfea8383c7d09572d072d3c 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -1,34 +1,52 @@
-diff -urN mysql-4.0.9-gamma.org/acinclude.m4 mysql-4.0.9-gamma/acinclude.m4
---- mysql-4.0.9-gamma.org/acinclude.m4 Mon Feb  3 23:34:15 2003
-+++ mysql-4.0.9-gamma/acinclude.m4     Tue Feb  4 00:11:55 2003
-@@ -715,6 +715,9 @@
-   if test -f $d/libssl.a ; then
-     OPENSSL_LIB=$d
-   fi
-+  if test -f $d/libssl.so ; then
-+    OPENSSL_LIB=$d
-+  fi
-  done
+--- mysql-4.0.15/configure.in.orig     2003-10-04 13:29:18.000000000 +0200
++++ mysql-4.0.15/configure.in  2003-10-04 13:46:50.506700624 +0200
+@@ -746,19 +746,21 @@
  
-  if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then
-
-diff -urN mysql-4.0.10-gamma.org/vio/Makefile.am mysql-4.0.10-gamma/vio/Makefile.am
---- mysql-4.0.10-gamma.org/vio/Makefile.am     Wed Jan 29 12:29:24 2003
-+++ mysql-4.0.10-gamma/vio/Makefile.am Wed Feb 12 01:50:02 2003
-@@ -21,13 +21,13 @@
- noinst_HEADERS =      
- test_ssl_SOURCES =   test-ssl.c
- test_ssl_LDADD =      @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
--                      ../strings/libmystrings.a libvio.a $(openssl_libs)
-+                      ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
- test_sslserver_SOURCES =   test-sslserver.c
- test_sslserver_LDADD =   @CLIENT_EXTRA_LDFLAGS@       ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
--                      ../strings/libmystrings.a libvio.a $(openssl_libs)
-+                      ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
- test_sslclient_SOURCES =   test-sslclient.c
- test_sslclient_LDADD =   @CLIENT_EXTRA_LDFLAGS@       ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
--                      ../strings/libmystrings.a libvio.a $(openssl_libs)
-+                      ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
- libvio_a_SOURCES =    vio.c viosocket.c viossl.c viosslfactories.c
+ AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
  
- # Don't update the files from bitkeeper
+-AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
+-  AC_CHECK_LIB(nsl, gethostbyname_r))
+-AC_CHECK_FUNC(gethostbyname_r)
++AC_CHECK_FUNC(gethostbyname_r, [],
++[AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
++  [AC_CHECK_LIB(nsl, gethostbyname_r)])])
+ 
+ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
+-AC_CHECK_FUNC(yp_get_default_domain, ,
+-  AC_CHECK_LIB(nsl, yp_get_default_domain))
+ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
+ # This may get things to compile even if bind-8 is installed
+ AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
+ # For crypt() on Linux
+-AC_CHECK_LIB(crypt, crypt)
++save_LIBS="$LIBS"
++LIBCRYPT=
++AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
++AC_SUBST(LIBCRYPT)
+ AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT)) 
++LIBS="$save_LIBS"
+ 
+ # For sem_xxx functions on Solaris 2.6
+ AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
+--- mysql-4.0.15/libmysql_r/Makefile.am.orig   2003-10-04 13:29:16.000000000 +0200
++++ mysql-4.0.15/libmysql_r/Makefile.am        2003-10-04 13:47:15.957831464 +0200
+@@ -30,7 +30,7 @@
+ libmysql_dir = $(top_srcdir)/libmysql
+ 
+ libmysqlclient_r_la_SOURCES = $(target_sources)
+-libmysqlclient_r_la_LIBADD = $(target_libadd)
++libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread
+ libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
+ 
+ # This is called from the toplevel makefile
+--- mysql-4.0.15/sql/Makefile.am.orig  2003-09-06 08:35:50.000000000 +0200
++++ mysql-4.0.15/sql/Makefile.am       2003-10-04 13:47:34.660988152 +0200
+@@ -43,7 +43,7 @@
+ mysqld_LDADD =                @MYSQLD_EXTRA_LDFLAGS@ \
+                       @bdb_libs@ @innodb_libs@ @pstack_libs@ \
+                         @innodb_system_libs@ \
+-                      $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
++                      $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@
+ noinst_HEADERS =      item.h item_func.h item_sum.h item_cmpfunc.h \
+                       item_strfunc.h item_timefunc.h item_uniq.h \
+                       item_create.h mysql_priv.h \