X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/f8cb52375f33a0948e3b75d7905608385e721e54..75b653893395b2d5957d12786ce17e66e11f970c:/disabled-packages/mariadb/build.sh

diff --git a/disabled-packages/mariadb/build.sh b/disabled-packages/mariadb/build.sh
index 5c16ba9d..0a5a05c1 100644
--- a/disabled-packages/mariadb/build.sh
+++ b/disabled-packages/mariadb/build.sh
@@ -1,17 +1,52 @@
-TERMUX_PKG_VERSION=10.1.21
 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=5a816355781ea22a6c65a436d8162f19bd292ec90e2b7d9499c031ae4a659490
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DSTACK_DIRECTION=-1 -DIMPORT_EXECUTABLES=$TERMUX_PKG_HOSTBUILD_DIR/import_executables.cmake -DPLUGIN_EXAMPLE=NO
--DCMAKE_USE_SYSTEM_LIBRARIES=True -DWITH_WSREP=False -DHAVE_UCONTEXT_H=False -DWITH_READLINE=ON -DWITH_PCRE=system -DWITH_JEMALLOC=OFF
--DWITH_SSL=system -DPLUGIN_DAEMON_EXAMPLE=NO -DINSTALL_UNIX_ADDRDIR=$TERMUX_PREFIX/tmp/mysqld.sock -DINSTALL_SCRIPTDIR=$TERMUX_PREFIX/bin
--DWITH_EXTRA_CHARSETS=complex -DMYSQL_DATADIR=$TERMUX_PREFIX/var/lib/mysql -DINSTALL_MANDIR=$TERMUX_PREFIX/share/man
--DINSTALL_PLUGINDIR=$TERMUX_PREFIX/lib/mysql/plugin -DBUILD_CONFIG=mysql_release -DENABLED_LOCAL_INFILE=ON -DTMPDIR=$TERMUX_PREFIX/tmp" #-DHAVE_IB_GCC_ATOMIC_BUILTINS=True
+TERMUX_PKG_SHA256=bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DBISON_EXECUTABLE=`which bison`
+-DBUILD_CONFIG=mysql_release
+-DCAT_EXECUTABLE=`which cat`
+-DENABLED_LOCAL_INFILE=ON
+-DHAVE_UCONTEXT_H=False
+-DIMPORT_EXECUTABLES=$TERMUX_PKG_HOSTBUILD_DIR/import_executables.cmake
+-DINSTALL_LAYOUT=DEB
+-DINSTALL_UNIX_ADDRDIR=$TERMUX_PREFIX/tmp/mysqld.sock
+-DMYSQL_DATADIR=$TERMUX_PREFIX/var/lib/mysql
+-DPLUGIN_AUTH_GSSAPI_CLIENT=NO
+-DPLUGIN_AUTH_GSSAPI=NO
+-DPLUGIN_DAEMON_EXAMPLE=NO
+-DPLUGIN_EXAMPLE=NO
+-DPLUGIN_GSSAPI=NO
+-DSTACK_DIRECTION=-1
+-DTMPDIR=$TERMUX_PREFIX/tmp
+-DWITH_EXTRA_CHARSETS=complex
+-DWITH_JEMALLOC=OFF
+-DWITH_PCRE=system
+-DWITH_READLINE=OFF
+-DWITH_SSL=system
+-DWITH_WSREP=False
+-DWITH_ZLIB=system
+-DWITH_INNODB_BZIP2=OFF
+-DWITH_INNODB_LZ4=OFF
+-DWITH_INNODB_LZMA=ON
+-DWITH_INNODB_LZO=OFF
+-DWITH_INNODB_SNAPPY=OFF
+"
 TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_DEPENDS="openssl, pcre, libcrypt, libbz2, libandroid-support, libandroid-glob, krb5, libgnustl"
+TERMUX_PKG_DEPENDS="liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
-TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
 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
@@ -28,7 +63,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
 }