mariadb: Update from 10.2.9 to 10.2.10

2017-11-07 05:47:37 +01:00 · 2017-11-07 05:47:37 +01:00 · 4e403d2cee
parent e4a9db43b8
commit 4e403d2cee
2 changed files with 16 additions and 2 deletions
--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://mariadb.org
 TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
-TERMUX_PKG_VERSION=10.2.9
-TERMUX_PKG_SHA256=12e0a01c52591ee77cf0f940fe65df024457fa16c70f08c6116048d576096124
+TERMUX_PKG_VERSION=10.2.10
+TERMUX_PKG_SHA256=5c7b83c4d2f7501ef9f187d8c97688a24fd3e53dc43bb388f8e1cead61a92fc2
 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBISON_EXECUTABLE=`which bison`
--- a/packages/mariadb/cmake-pcre.cmake.patch
+++ b/packages/mariadb/cmake-pcre.cmake.patch
@ -0,0 +1,14 @@
+diff -u -r ../mariadb-10.2.10/cmake/pcre.cmake ./cmake/pcre.cmake
+--- ../mariadb-10.2.10/cmake/pcre.cmake	2017-10-30 09:10:43.000000000 +0100
+++ ./cmake/pcre.cmake	2017-11-07 04:56:54.904935897 +0100
+@@ -6,7 +6,9 @@
+ MACRO (CHECK_PCRE)
+   IF(WITH_PCRE STREQUAL "system" OR WITH_PCRE STREQUAL "auto")
+     CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE_STACK_GUARD)
+-    IF(NOT CMAKE_CROSSCOMPILING)
+    IF(CMAKE_CROSSCOMPILING)
+      SET(PCRE_STACK_SIZE_OK TRUE)
+    ELSE()
+       SET(CMAKE_REQUIRED_LIBRARIES "pcre")
+       CHECK_C_SOURCE_RUNS("
+         #include <pcre.h>