From 94db67b19b9bfad478628d5c22a47a860ca8e443 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 24 Jul 2019 14:45:12 +0300 Subject: [PATCH] mariadb: update to 10.4.6 --- packages/mariadb/build.sh | 5 ++-- packages/mariadb/client-CMakeLists.txt.patch | 24 +++++++++----------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index e4d41b938..03a27febd 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" -TERMUX_PKG_VERSION=10.3.14 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_VERSION=10.4.6 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=ba1c94d92fc8ebdf9b8a1d1b93ed6aeeead33da507efbbd4afcf49f32023e054 +TERMUX_PKG_SHA256=a270fe6169a1aaf6f2cbbc945de2c954d818c48e1a0fc02fbed92ecb94678e70 TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/mariadb/client-CMakeLists.txt.patch b/packages/mariadb/client-CMakeLists.txt.patch index 6bd0f6655..e5297b913 100644 --- a/packages/mariadb/client-CMakeLists.txt.patch +++ b/packages/mariadb/client-CMakeLists.txt.patch @@ -1,24 +1,22 @@ -diff -u -r ../mariadb-10.3.14/client/CMakeLists.txt ./client/CMakeLists.txt ---- ../mariadb-10.3.14/client/CMakeLists.txt 2019-04-01 14:03:56.000000000 +0000 -+++ ./client/CMakeLists.txt 2019-04-11 21:36:27.617921632 +0000 -@@ -44,12 +44,6 @@ +diff -uNr mariadb-10.4.6/client/CMakeLists.txt mariadb-10.4.6.mod/client/CMakeLists.txt +--- mariadb-10.4.6/client/CMakeLists.txt 2019-06-18 01:00:31.000000000 +0300 ++++ mariadb-10.4.6.mod/client/CMakeLists.txt 2019-07-24 17:53:17.771246533 +0300 +@@ -44,10 +44,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} pcreposix pcre) -SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -- -- + + MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) - -@@ -94,7 +88,7 @@ +@@ -92,7 +88,7 @@ + SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example PROPERTIES HAS_CXX TRUE) - - --FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog + +-FOREACH(t mysql 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})