[Pkg-hhvm-team] Bug#825077: Package links against libmysqlclient_r

[Robie Basak]

Package: hhvm
Version: 3.12.1+dfsg-1
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch

Dear Maintainer,

Please stop linking against libmysqlclient_r and link directly against
libmysqlclient instead.

Your package currently links against libmysqlclient_r. libmysqlclient_r
was the thread-safe version of libmysqlclient in previous MySQL
releases. However, libmysqlclient has been itself been made thread-safe
since before the current libmysqlclient18. Thus libmysqlclient_r is
currently deprecated and provided as a compatibility symlink only, and
will disappear in MySQL 5.7. This change can be made now, in advance of
a possible future transition to libmysqlclient20, which does not provide
the _r variant.

For hhvm, we have done this in Ubuntu with the attached quilt
patch, which I believe is also applicable to Debian.

Thanks,

Robie Basak
Debian MySQL maintainers team
Ubuntu developer
-------------- next part --------------
Author: Robie Basak <robie.basak at canonical.com>
Bug-Ubuntu: https://launchpad.net/bugs/1564871
Forwarded: no
Last-Update: 2016-04-01

--- a/CMake/FindMySQL.cmake
+++ b/CMake/FindMySQL.cmake
@@ -66,7 +66,7 @@
     $ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist}
     $ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist})
 ELSE (WIN32)
-  FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient_r
+  FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient
     PATHS
     /usr/lib/mysql
     /usr/local/lib/mysql
@@ -90,7 +90,7 @@
 
   FIND_LIBRARY(MYSQL_ZLIB zlib PATHS ${MYSQL_LIB_DIR})
   FIND_LIBRARY(MYSQL_TAOCRYPT taocrypt PATHS ${MYSQL_LIB_DIR})
-  SET(MYSQL_CLIENT_LIBS mysqlclient_r)
+  SET(MYSQL_CLIENT_LIBS mysqlclient)
   IF (MYSQL_ZLIB)
     SET(MYSQL_CLIENT_LIBS ${MYSQL_CLIENT_LIBS} zlib)
   ENDIF (MYSQL_ZLIB)