[packages/hhvm/dev-3.6] try system webscaleclient

[glen]

commit cb8654b2225dfe6e2dc1ff8ae27e49c2b5f69e57
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Apr 8 11:53:34 2015 +0300

    try system webscaleclient

 hhvm.spec                      |  5 ++++-
 system-webscalesqlclient.patch | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index 047ff52..a595de8 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -76,6 +76,7 @@ Patch6:		webscalesql-5.6-build.patch
 Patch7:		disable-fastcgi.patch
 Patch8:		folly-malloc_usable_size.patch
 Patch9:		mcrouter-chrono.patch
+Patch10:	system-webscalesqlclient.patch
 URL:		https://github.com/facebook/hhvm/wiki
 BuildRequires:	ImageMagick-devel
 BuildRequires:	a52dec-libs-devel
@@ -112,7 +113,8 @@ BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
 %{?with_system_libzip:BuildRequires:	libzip-devel >= 0.11.2}
 %{?with_system_lz4:BuildRequires:	lz4-devel >= 0.0-1.r119}
-BuildRequires:	mysql-devel
+#BuildRequires:	mysql-devel
+BuildRequires:	webscalesql-devel
 BuildRequires:	ocaml-findlib
 BuildRequires:	oniguruma-devel
 BuildRequires:	openssl-devel
@@ -316,6 +318,7 @@ mv mcrouter-* third-party/mcrouter/src
 %patch7 -p1
 %patch8 -p1 -d third-party
 %patch9 -p1
+%patch10 -p1
 
 # prefer ones from system
 rm CMake/FindBISON.cmake
diff --git a/system-webscalesqlclient.patch b/system-webscalesqlclient.patch
new file mode 100644
index 0000000..3be7af6
--- /dev/null
+++ b/system-webscalesqlclient.patch
@@ -0,0 +1,14 @@
+--- hhvm-HHVM-3.6.1/third-party/CMakeLists.txt~	2015-02-18 00:42:17.000000000 +0200
++++ hhvm-HHVM-3.6.1/third-party/CMakeLists.txt	2015-04-07 22:25:45.305012976 +0300
+@@ -49,7 +49,10 @@
+     list(APPEND THIRD_PARTY_MODULES re2)
+   endif()
+   list(APPEND THIRD_PARTY_MODULES squangle)
+-  list(APPEND THIRD_PARTY_MODULES webscalesqlclient)
++  # Add bundled webscalesqlclient if the system one will not be used
++  if(NOT WEBSCALESQLCLIENT_LIBRARY)
++    list(APPEND THIRD_PARTY_MODULES webscalesqlclient)
++  endif()
+ endif()
+ 
+ if (ENABLE_MCROUTER)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/cb8654b2225dfe6e2dc1ff8ae27e49c2b5f69e57