mariadb: Blacklist 32-bit arches due to off_t (#935)

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

diff --git a/disabled-packages/mariadb/my_global.h.patch32 b/disabled-packages/mariadb/my_global.h.patch32
deleted file mode 100644 (file)
index 5b42429..0000000
--- a/disabled-packages/mariadb/my_global.h.patch32
+++ /dev/null
@@ -1,12 +0,0 @@
-32 bit arches have 32 bit off_t on Android
---- ./include/my_global.h      2017-01-18 01:08:20.000000000 +0530
-+++ ../my_global.h     2017-02-01 09:24:13.543592127 +0530
-@@ -974,7 +974,7 @@
- 
- #define MY_ERRPTR ((void*)(intptr)1)
- 
--#if defined(_WIN32)
-+#if defined(_WIN32) || defined(__ANDROID__)
- typedef unsigned long long my_off_t;
- typedef unsigned long long os_off_t;
- #else