mariadb: Enable 32-bit builds again

diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh
index a27bfd7a6836f3de8191158b1ae05e77d54c2c95..ea95451aeaa37645e7cbb57ae0635922d1eff738 100644 (file)
--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@@ -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*"
 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
 
 termux_step_host_build () {
        termux_setup_cmake


@@ -60,9 +57,11 @@ termux_step_host_build () {
 }
 
 termux_step_pre_configure () {
 }
 
 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:
 
        if [ $TERMUX_ARCH = "i686" ]; then
                # Avoid undefined reference to __atomic_load_8: