mariadb: Some build tweaks

- Build with system zlib instead of bundled
- Disable libbz2
- Fix build issues if cross compiled binaries of 'cat' and 'bison'
  are in the path.

diff --git a/disabled-packages/mariadb/build.sh b/disabled-packages/mariadb/build.sh
index 438cc16..cf7d6c9 100644 (file)
--- a/disabled-packages/mariadb/build.sh
+++ b/disabled-packages/mariadb/build.sh
@@ -4,7 +4,9 @@ TERMUX_PKG_VERSION=10.1.22
 TERMUX_PKG_SRCURL=http://mirror.fibergrid.in/mariadb//mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DBISON_EXECUTABLE=`which bison`
 -DBUILD_CONFIG=mysql_release
+-DCAT_EXECUTABLE=`which cat`
 -DENABLED_LOCAL_INFILE=ON
 -DHAVE_UCONTEXT_H=False
 -DIMPORT_EXECUTABLES=$TERMUX_PKG_HOSTBUILD_DIR/import_executables.cmake
@@ -26,9 +28,15 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWITH_READLINE=OFF
 -DWITH_SSL=system
 -DWITH_WSREP=False
+-DWITH_ZLIB=system
+-DWITH_INNODB_BZIP2=OFF
+-DWITH_INNODB_LZ4=OFF
+-DWITH_INNODB_LZMA=ON
+-DWITH_INNODB_LZO=OFF
+-DWITH_INNODB_SNAPPY=OFF
 "
 TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_DEPENDS="liblzma, ncurses, libedit, openssl, pcre, libcrypt, libbz2, libandroid-support, libandroid-glob"
+TERMUX_PKG_DEPENDS="liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_CONFLICTS="mysql"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/mysqltest*"