X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/210798fcd2fa8a1cdc647790e693099f270c09cb..c9d43c92aa28addcfd28adef18f4224bc1f554cf:/disabled-packages/mariadb/build.sh

diff --git a/disabled-packages/mariadb/build.sh b/disabled-packages/mariadb/build.sh
index cf7d6c93..be36beb1 100644
--- a/disabled-packages/mariadb/build.sh
+++ b/disabled-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_VERSION=10.1.22
-TERMUX_PKG_SRCURL=http://mirror.fibergrid.in/mariadb//mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce
+TERMUX_PKG_VERSION=10.1.23
+TERMUX_PKG_SRCURL=http://mirror.fibergrid.in/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBISON_EXECUTABLE=`which bison`
 -DBUILD_CONFIG=mysql_release
@@ -10,9 +10,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DENABLED_LOCAL_INFILE=ON
 -DHAVE_UCONTEXT_H=False
 -DIMPORT_EXECUTABLES=$TERMUX_PKG_HOSTBUILD_DIR/import_executables.cmake
--DINSTALL_MANDIR=$TERMUX_PREFIX/share/man
--DINSTALL_PLUGINDIR=$TERMUX_PREFIX/lib/mysql/plugin
--DINSTALL_SCRIPTDIR=$TERMUX_PREFIX/bin
+-DINSTALL_LAYOUT=DEB
 -DINSTALL_UNIX_ADDRDIR=$TERMUX_PREFIX/tmp/mysqld.sock
 -DMYSQL_DATADIR=$TERMUX_PREFIX/var/lib/mysql
 -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
@@ -24,6 +22,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DTMPDIR=$TERMUX_PREFIX/tmp
 -DWITH_EXTRA_CHARSETS=complex
 -DWITH_JEMALLOC=OFF
+-DWITH_MARIABACKUP=OFF
 -DWITH_PCRE=system
 -DWITH_READLINE=OFF
 -DWITH_SSL=system
@@ -40,6 +39,15 @@ TERMUX_PKG_DEPENDS="liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandro
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_CONFLICTS="mysql"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/mysqltest*"
+# MariaDB doesn't support 32-bit off_t systems, see
+# https://bugs.mysql.com/bug.php?id=41309
+# It builds with -D_FILE_OFFSET_BITS=64 but the NDK only starts supporting
+# that with unified headers,
+# https://android.googlesource.com/platform/ndk/+/master/docs/UnifiedHeaders.md
+# The unified headers are new in the current NDK r14 release and contains some
+# issues which are being fixed for r15, at which time we'll probably switch to it.
+# In the meantime we don't build mariadb for 32-bit arches.
+TERMUX_PKG_BLACKLISTED_ARCHES="arm,i686"
 
 termux_step_host_build () {
 	termux_setup_cmake
@@ -56,7 +64,7 @@ termux_step_pre_configure () {
 termux_step_post_make_install () {
 	mkdir -p $TERMUX_PREFIX/var/lib/mysql
 	# files not needed
-	rm -r $TERMUX_PREFIX/{data,mysql-test,sql-bench}
+	rm -r $TERMUX_PREFIX/{mysql-test,sql-bench}
 	rm $TERMUX_PREFIX/share/man/man1/mysql-test-run.pl.1
 }