[patch] This patch removes the libmysqlclient_r detection, so that PHP will always use libmysqlclient.

libmysqlclient.patch (text/plain), 1.20 KB, created by Thomas Deutschmann (RETIRED) on 2012-12-03 00:21:58 UTC

MySQL never had a real mysqlclient_r (thread-safe version). All the time,
libmysqlclient_r was just a symlink or a copy of libmysqlclient.

In MySQL 5.5 they finally removed mysqlclient_r.

Because there wasn't a mysqlclient_r version, we can just remove this check
and use mysqclient.

See https://bugs.gentoo.org/440918

--- ext/mysql/config.m4	2012-11-21 21:07:23.000000000 +0100
+++ ext/mysql/config.m4.new	2012-12-03 00:20:13.250375588 +0100
@@ -78,11 +78,8 @@
 Note that the MySQL client library is not bundled anymore!])
   fi
 
-  if test "$enable_maintainer_zts" = "yes"; then
-    MYSQL_LIBNAME=mysqlclient_r
-  else
-    MYSQL_LIBNAME=mysqlclient
-  fi
+  MYSQL_LIBNAME=mysqlclient
+  
   case $host_alias in
     *netware*[)]
       MYSQL_LIBNAME=mysql


--- ext/mysqli/config.m4	2012-11-21 21:07:23.000000000 +0100
+++ ext/mysqli/config.m4.new	2012-12-03 00:38:29.390402044 +0100
@@ -29,9 +29,6 @@
     MYSQL_LIB_CFG='--libmysqld-libs'
     dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
     mysqli_extra_sources="mysqli_embedded.c"
-  elif test "$enable_maintainer_zts" = "yes"; then
-    MYSQL_LIB_CFG='--libs_r'
-    MYSQL_LIB_NAME='mysqlclient_r'
   else
     MYSQL_LIB_CFG='--libs'
   fi