From: Vishal Biswas <vshlbiswas@ymail.com>
Date: Sat, 1 Jul 2017 06:44:49 +0000 (+0530)
Subject: remove unnecessary patches and enable mariadb for arm and i686 (#1115)
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/2b468f0d74adcd887b3c96d79035b6fea9b1a1a1

remove unnecessary patches and enable mariadb for arm and i686 (#1115)

* krb5: res_init and res_search prototypes are now declared

* mariadb: snprintf is no longer a macro

* mariadb: enable arm, i686
---

diff --git a/packages/krb5/dnsglue.h.patch b/packages/krb5/dnsglue.h.patch
deleted file mode 100644
index 35119d29..00000000
--- a/packages/krb5/dnsglue.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./lib/krb5/os/dnsglue.h	2016-12-02 04:01:25.000000000 +0530
-+++ ../dnsglue.h	2016-12-06 23:46:48.394430806 +0530
-@@ -150,6 +150,12 @@
-         (ptr) += (incr);                                \
-     } while (0)
- 
-+/* Bionic has res_init() but it's not in any header */
-+#ifdef __BIONIC__
-+extern int res_init (void);
-+extern int res_search (const char *dname, int class, int type,unsigned char *answer, int anslen);
-+#endif
-+
- struct krb5int_dns_state;
- 
- int krb5int_dns_init(struct krb5int_dns_state **, char *, int, int);
diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh
index 7bd9885f..37fd58dc 100644
--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@@ -44,15 +44,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*"
-# 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/packages/mariadb/m_ctype.h.patch b/packages/mariadb/m_ctype.h.patch
deleted file mode 100644
index 12094e75..00000000
--- a/packages/mariadb/m_ctype.h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-bionic snprintf is defined as a macro, so this saves chaos
---- ./include/m_ctype.h	2017-01-18 01:08:20.000000000 +0530
-+++ ../m_ctype.h	2017-02-01 09:14:37.958658913 +0530
-@@ -398,7 +398,9 @@
-   const char *m_cannot_convert_error_pos;
- } MY_STRCONV_STATUS;
- 
--
-+#ifdef __ANDROID__
-+#undef snprintf
-+#endif
- /* See strings/CHARSET_INFO.txt about information on this structure  */
- struct my_charset_handler_st
- {