alpine: update to 2.21 (#961)

[termux-packages] / disabled-packages / mariadb / build.sh

diff --git a/disabled-packages/mariadb/build.sh b/disabled-packages/mariadb/build.sh
index cf7d6c9..0a5a05c 100644 (file)
--- a/disabled-packages/mariadb/build.sh
+++ b/disabled-packages/mariadb/build.sh
@@ -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
@@ -40,6 +38,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 +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
 }