SOURCES (MYSQL_4_1): mysql-libs.patch - update to 4.1.19 (or did u...
glen
glen at pld-linux.org
Thu May 4 21:42:06 CEST 2006
Author: glen Date: Thu May 4 19:42:06 2006 GMT
Module: SOURCES Tag: MYSQL_4_1
---- Log message:
- update to 4.1.19 (or did upstream got it right this time?)
---- Files affected:
SOURCES:
mysql-libs.patch (1.10 -> 1.10.2.1)
---- Diffs:
================================================================
Index: SOURCES/mysql-libs.patch
diff -u SOURCES/mysql-libs.patch:1.10 SOURCES/mysql-libs.patch:1.10.2.1
--- SOURCES/mysql-libs.patch:1.10 Sun Dec 26 11:36:08 2004
+++ SOURCES/mysql-libs.patch Thu May 4 21:42:01 2006
@@ -1,7 +1,6 @@
-diff -urN mysql-4.1.7.org/configure.in mysql-4.1.7/configure.in
---- mysql-4.1.7.org/configure.in 2004-10-27 01:35:54.930172056 +0200
-+++ mysql-4.1.7/configure.in 2004-10-27 01:39:04.368373072 +0200
-@@ -779,19 +779,20 @@
+--- mysql-4.1.19/configure.in~ 2006-05-04 22:37:01.424363499 +0300
++++ mysql-4.1.19/configure.in 2006-05-04 22:39:56.658291086 +0300
+@@ -817,18 +817,20 @@
AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
@@ -18,17 +17,16 @@
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)
+ # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
+-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
+save_LIBS="$LIBS"
+AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
+AC_SUBST(LIBCRYPT)
- AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
++AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
+LIBS="$save_LIBS"
# For sem_xxx functions on Solaris 2.6
AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
-diff -urN mysql-4.1.7.org/libmysql_r/Makefile.am mysql-4.1.7/libmysql_r/Makefile.am
--- mysql-4.1.7.org/libmysql_r/Makefile.am 2004-10-27 01:35:55.265121136 +0200
+++ mysql-4.1.7/libmysql_r/Makefile.am 2004-10-27 01:36:23.574817408 +0200
@@ -33,7 +33,7 @@
@@ -40,7 +38,6 @@
libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
# This is called from the toplevel makefile
-diff -urN mysql-4.1.7.org/sql/Makefile.am mysql-4.1.7/sql/Makefile.am
--- mysql-4.1.7.org/sql/Makefile.am 2004-10-27 01:35:55.971013824 +0200
+++ mysql-4.1.7/sql/Makefile.am 2004-10-27 01:37:07.260176224 +0200
@@ -43,7 +43,7 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mysql-libs.patch?r1=1.10&r2=1.10.2.1&f=u
More information about the pld-cvs-commit
mailing list