- fix mysql detection (no *_r libraries oas of mysql 5.7)

diff --git a/hhvm.spec b/hhvm.spec
index 7c2ffc0c01ece72c9f038c95465b3ae669ddf7ee..aeaa3c09d295c396bb8e2af18ac57cb3425bd7fe 100644 (file)
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -58,6 +58,7 @@ Patch8:               cxx.patch
 Patch9:                gcc6.patch
 Patch10:       libevent-2.1.patch
 Patch11:       icu59.patch
+Patch12:       no-mysql_r.patch
 URL:           https://github.com/facebook/hhvm/wiki
 BuildRequires: ImageMagick-devel
 BuildRequires: a52dec-libs-devel
@@ -271,6 +272,7 @@ mv folly-* third-party/folly/src
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 # prefer ones from system
 rm CMake/FindBISON.cmake

diff --git a/no-mysql_r.patch b/no-mysql_r.patch
new file mode 100644 (file)
index 0000000..899e8f2
--- /dev/null
+++ b/no-mysql_r.patch
@@ -0,0 +1,23 @@
+--- hhvm-HHVM-3.3.7/CMake/FindMySQL.cmake~     2015-06-30 21:56:17.000000000 +0200
++++ hhvm-HHVM-3.3.7/CMake/FindMySQL.cmake      2018-03-19 10:28:11.799766518 +0100
+@@ -67,9 +67,9 @@
+     $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
+-    $ENV{MYSQL_DIR}/libmysql_r/.libs
++    $ENV{MYSQL_DIR}/libmysql/.libs
+     $ENV{MYSQL_DIR}/lib
+     $ENV{MYSQL_DIR}/lib/mysql
+     /usr/lib/mysql
+@@ -95,7 +95,7 @@
+   FIND_LIBRARY(MYSQL_ZLIB zlib PATHS ${MYSQL_LIB_DIR})
+   FIND_LIBRARY(MYSQL_YASSL yassl 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)