[packages/mysql] - added system-libhsclient patch; build handlersocket plugin using system libhsclient

[qboosh]

commit 3d33ff780a3b8b0086ad1f707d2b07db749e2f6a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 7 09:21:14 2014 +0200

    - added system-libhsclient patch; build handlersocket plugin using system libhsclient

 mysql-system-libhsclient.patch | 15 +++++++++++++++
 mysql.spec                     | 15 ++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 1072ce0..757f779 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -62,6 +62,7 @@ Patch1:		%{name}-versioning.patch
 Patch2:		%{name}hotcopy-5.0-5.5.patch
 Patch3:		bug-67402.patch
 Patch4:		%{name}-no-default-secure-auth.patch
+Patch5:		%{name}-system-libhsclient.patch
 # from fedora
 Patch6:		%{name}-system-users.patch
 
@@ -89,6 +90,7 @@ BuildRequires:	libstdc++4-devel >= 5:4.0
 BuildRequires:	libstdc++-devel >= 5:4.0
 %endif
 BuildRequires:	automake
+BuildRequires:	libhsclient-devel
 %{?with_tcpd:BuildRequires:	libwrap-devel}
 BuildRequires:	ncurses-devel >= 4.2
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
@@ -508,7 +510,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
+%patch5 -p1
 %patch6 -p1
 
 %patch9 -p1
@@ -525,8 +527,8 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch26 -p1
 
 # to get these files rebuild
-[ -f sql/sql_yacc.cc ] && rm sql/sql_yacc.cc
-[ -f sql/sql_yacc.h ] && rm sql/sql_yacc.h
+[ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc
+[ -f sql/sql_yacc.h ] && %{__rm} sql/sql_yacc.h
 
 # map has more sane versioning that default "global everything" in ver.in
 cp -p libmysql/libmysql.map libmysql/libmysql.ver.in
@@ -545,7 +547,7 @@ cd build
 %{expand:%%define	__cpp	%(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
 %endif
 
-%cmake \
+%cmake .. \
 	-DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \
 	-DCMAKE_C_FLAGS_RELEASE="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
 	-DCMAKE_CXX_FLAGS_RELEASE="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
@@ -575,8 +577,7 @@ cd build
 	-DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \
 %endif
 	-DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
-	-DWITH_ZLIB=system \
-	..
+	-DWITH_ZLIB=system
 
 %{__make}
 
@@ -915,7 +916,7 @@ done
 #%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_archive.so
 #%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_blackhole.so
 #%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so
-#%attr(755,root,root) %{_libdir}/%{name}/plugin/handlersocket.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/handlersocket.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv1a_udf.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv_udf.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/libmurmur_udf.so
diff --git a/mysql-system-libhsclient.patch b/mysql-system-libhsclient.patch
new file mode 100644
index 0000000..ca81903
--- /dev/null
+++ b/mysql-system-libhsclient.patch
@@ -0,0 +1,15 @@
+--- percona-server-5.6.20-68.0/plugin/HandlerSocket-Plugin-for-MySQL/CMakeLists.txt.orig	2014-09-06 08:40:46.096111513 +0200
++++ percona-server-5.6.20-68.0/plugin/HandlerSocket-Plugin-for-MySQL/CMakeLists.txt	2014-09-07 07:52:06.829274818 +0200
+@@ -2,10 +2,9 @@
+   STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ ENDIF()
+ ADD_DEFINITIONS(-fno-rtti -fno-exceptions -fPIC -DPIC)
+-ADD_SUBDIRECTORY(libhsclient)
+-INCLUDE_DIRECTORIES(libhsclient)
++INCLUDE_DIRECTORIES(/usr/include/handlersocket)
+ SET ( HANDLERSOCKET_SOURCES
+     handlersocket/database.cpp handlersocket/handlersocket.cpp handlersocket/hstcpsvr_worker.cpp handlersocket/hstcpsvr.cpp
+ )
+ 
+-MYSQL_ADD_PLUGIN(handlersocket ${HANDLERSOCKET_SOURCES} LINK_LIBRARIES hsclient MODULE_ONLY)
++MYSQL_ADD_PLUGIN(handlersocket ${HANDLERSOCKET_SOURCES} LINK_LIBRARIES hsclient  MODULE_ONLY)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/3d33ff780a3b8b0086ad1f707d2b07db749e2f6a