diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index 4af1bfb94..878effee9 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=10.3.13 -TERMUX_PKG_SHA256=b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a +TERMUX_PKG_VERSION=10.3.14 +TERMUX_PKG_SHA256=ba1c94d92fc8ebdf9b8a1d1b93ed6aeeead33da507efbbd4afcf49f32023e054 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) diff --git a/packages/mariadb/client-CMakeLists.txt.patch b/packages/mariadb/client-CMakeLists.txt.patch new file mode 100644 index 000000000..6bd0f6655 --- /dev/null +++ b/packages/mariadb/client-CMakeLists.txt.patch @@ -0,0 +1,25 @@ +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 @@ + 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 @@ + 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()