[Pkg-php-commits] r1039 - in php5/trunk/debian: . patches

[Sean Finney]

tags 469081 pending
thanks

Author: seanius
Date: 2008-05-03 12:17:50 +0000 (Sat, 03 May 2008)
New Revision: 1039

Added:
   php5/trunk/debian/patches/force_libmysqlclient_r.patch
Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/series
Log:
force _r mysql lib

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-05-03 12:07:33 UTC (rev 1038)
+++ php5/trunk/debian/changelog	2008-05-03 12:17:50 UTC (rev 1039)
@@ -9,6 +9,11 @@
     with PHP.  Many thanks to Joe Orten from Red Hat for the patch!
     closes: #447174.
   * Updated the Suhosin patch to v0.9.6 (5.2.6).
+  * New patch: force_libmysqlclient_r.patch, forcing the build system
+    to link against the threadsafe libmysqlclient without having to enable
+    the other zts features in php.  This is required since the apr libraries
+    are now linking against this as well and mysql exports the same symbols
+    from both libraries.  Thanks to Stefan Fritsch (closes: #469081).
   * Massaged/updated various other patches in debian/patches
   * Update copyright information to have information about non-trivial 
     patches worthy of copyright attributions, and update information about

Added: php5/trunk/debian/patches/force_libmysqlclient_r.patch
===================================================================
--- php5/trunk/debian/patches/force_libmysqlclient_r.patch	                        (rev 0)
+++ php5/trunk/debian/patches/force_libmysqlclient_r.patch	2008-05-03 12:17:50 UTC (rev 1039)
@@ -0,0 +1,39 @@
+Index: php5-5.2.5/ext/mysql/config.m4
+===================================================================
+--- php5-5.2.5.orig/ext/mysql/config.m4	2008-03-01 21:03:07.000000000 +0100
++++ php5-5.2.5/ext/mysql/config.m4	2008-03-01 21:03:36.000000000 +0100
+@@ -86,7 +86,7 @@
+ Note that the MySQL client library is not bundled anymore!])
+   fi
+ 
+-  if test "$enable_maintainer_zts" = "yes"; then
++  if true || test "$enable_maintainer_zts" = "yes"; then
+     MYSQL_LIBNAME=mysqlclient_r
+   else
+     MYSQL_LIBNAME=mysqlclient
+Index: php5-5.2.5/ext/mysqli/config.m4
+===================================================================
+--- php5-5.2.5.orig/ext/mysqli/config.m4	2008-03-01 21:03:07.000000000 +0100
++++ php5-5.2.5/ext/mysqli/config.m4	2008-03-01 21:03:58.000000000 +0100
+@@ -26,7 +26,7 @@
+   if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
+     AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
+     MYSQL_LIB_CFG='--libmysqld-libs'
+-  elif test "$enable_maintainer_zts" = "yes"; then
++  elif true || test "$enable_maintainer_zts" = "yes"; then
+     MYSQL_LIB_CFG='--libs_r'
+     MYSQL_LIB_NAME='mysqlclient_r'
+   else
+Index: php5-5.2.5/ext/pdo_mysql/config.m4
+===================================================================
+--- php5-5.2.5.orig/ext/pdo_mysql/config.m4	2008-03-01 21:03:07.000000000 +0100
++++ php5-5.2.5/ext/pdo_mysql/config.m4	2008-03-01 21:03:50.000000000 +0100
+@@ -58,7 +58,7 @@
+     if test "x$SED" = "x"; then
+       AC_PATH_PROG(SED, sed)
+     fi
+-    if test "$enable_maintainer_zts" = "yes"; then
++    if true || test "$enable_maintainer_zts" = "yes"; then
+       PDO_MYSQL_LIBNAME=mysqlclient_r
+       PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
+     else

Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series	2008-05-03 12:07:33 UTC (rev 1038)
+++ php5/trunk/debian/patches/series	2008-05-03 12:17:50 UTC (rev 1039)
@@ -30,3 +30,4 @@
 fix_broken_upstream_tests.patch
 use_embedded_timezonedb.patch
 manpage_spelling.patch
+force_libmysqlclient_r.patch