mariadb: bump package after my.cnf patch

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

diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh
index a27bfd7..fade623 100644 (file)
--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://mariadb.org
 TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
-TERMUX_PKG_VERSION=10.2.6
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=10.2.10
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SHA256=5c7b83c4d2f7501ef9f187d8c97688a24fd3e53dc43bb388f8e1cead61a92fc2
 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBISON_EXECUTABLE=`which bison`
 -DBUILD_CONFIG=mysql_release
@@ -46,9 +46,6 @@ 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*"
-# Does not build with 32-bit off_t, and Termux does not use
-# _FILE_OFFSET_BITS=64 as it doesn't work very well on Android.
-TERMUX_PKG_BLACKLISTED_ARCHES="arm,i686"
 
 termux_step_host_build () {
        termux_setup_cmake
@@ -60,9 +57,11 @@ termux_step_host_build () {
 }
 
 termux_step_pre_configure () {
-       # it will try to define off64_t with off_t if unset
-       # and 32 bit Android has wrong off_t defined
-       CPPFLAGS="$CPPFLAGS -Dushort=u_short"
+       CPPFLAGS+=" -Dushort=u_short"
+
+       if [ $TERMUX_ARCH_BITS = 32 ]; then
+               CPPFLAGS+=" -D__off64_t_defined -DTERMUX_EXPOSE_FILE_OFFSET64=1"
+       fi
 
        if [ $TERMUX_ARCH = "i686" ]; then
                # Avoid undefined reference to __atomic_load_8:
@@ -71,16 +70,17 @@ termux_step_pre_configure () {
 }
 
 termux_step_post_make_install () {
-       mkdir -p $TERMUX_PREFIX/var/lib/mysql
        # files not needed
        rm -r $TERMUX_PREFIX/{mysql-test,sql-bench}
        rm $TERMUX_PREFIX/share/man/man1/mysql-test-run.pl.1
 }
 
 termux_step_create_debscripts () {
-       return
-       echo "echo 'Initializing mysql data directory...'" > postinst
-       echo "$TERMUX_PREFIX/bin/mysql_install_db --user=\`whoami\` --datadir=$TERMUX_PREFIX/var/lib/mysql --basedir=$TERMUX_PREFIX" >> postinst
+       echo "if [ ! -e "$TERMUX_PREFIX/var/lib/mysql" ]; then" > postinst
+       echo "  echo 'Initializing mysql data directory...'" >> postinst
+       echo "  mkdir -p $TERMUX_PREFIX/var/lib/mysql" >> postinst
+       echo "  $TERMUX_PREFIX/bin/mysql_install_db --user=\`whoami\` --datadir=$TERMUX_PREFIX/var/lib/mysql --basedir=$TERMUX_PREFIX" >> postinst
+       echo "fi" >> postinst
        echo "exit 0" >> postinst
        chmod 0755 postinst
 }