From 26dc08651e7cc33baa6070c8488983e7086f91f1 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 10 Aug 2017 02:00:13 +0200
Subject: [PATCH] mariadb: Patch away building mysqltest

This avoids needing libpcreposix when building.
---
 packages/mariadb/CMakeLists.txt.patch        | 11 +++++++++++
 packages/mariadb/client-CMakeLists.txt.patch | 25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 packages/mariadb/CMakeLists.txt.patch
 create mode 100644 packages/mariadb/client-CMakeLists.txt.patch

diff --git a/packages/mariadb/CMakeLists.txt.patch b/packages/mariadb/CMakeLists.txt.patch
new file mode 100644
index 00000000..41141380
--- /dev/null
+++ b/packages/mariadb/CMakeLists.txt.patch
@@ -0,0 +1,11 @@
+diff -u -r ../mariadb-10.2.7/CMakeLists.txt ./CMakeLists.txt
+--- ../mariadb-10.2.7/CMakeLists.txt	2017-07-10 10:53:26.000000000 +0000
++++ ./CMakeLists.txt	2017-08-09 23:44:24.691181837 +0000
+@@ -386,7 +386,6 @@
+   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
+   IF(WITH_EMBEDDED_SERVER) 
+    ADD_SUBDIRECTORY(libmysqld)
+-   ADD_SUBDIRECTORY(libmysqld/examples)
+   ENDIF(WITH_EMBEDDED_SERVER)
+ 
+   IF(WITH_WSREP)
diff --git a/packages/mariadb/client-CMakeLists.txt.patch b/packages/mariadb/client-CMakeLists.txt.patch
new file mode 100644
index 00000000..8cb17071
--- /dev/null
+++ b/packages/mariadb/client-CMakeLists.txt.patch
@@ -0,0 +1,25 @@
+diff -u -r ../mariadb-10.2.7/client/CMakeLists.txt ./client/CMakeLists.txt
+--- ../mariadb-10.2.7/client/CMakeLists.txt	2017-07-10 10:53:27.000000000 +0000
++++ ./client/CMakeLists.txt	2017-08-09 23:33:34.537797770 +0000
+@@ -43,12 +43,6 @@
+   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
+ ENDIF(UNIX)
+ 
+-MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+-SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+-TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcre pcreposix)
+-SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
+-
+-
+ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
+ TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB})
+ 
+@@ -93,7 +87,7 @@
+ PROPERTIES HAS_CXX TRUE)
+ 
+ 
+-FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
++FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
+   mysqladmin mysqlslap async_example)
+   ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
+ ENDFOREACH()
-- 
2.11.0