From 809be5bbeb80c0f138cde00f71b3c0c29a0502ec Mon Sep 17 00:00:00 2001
From: vishalbiswas <vshlbiswas@ymail.com>
Date: Tue, 7 Nov 2017 22:15:16 +0530
Subject: [PATCH] php-mysql: add package

---
 packages/php/build.sh                      |  5 +++++
 packages/php/ext-mysqli-config.m4.patch    | 10 ++++++++++
 packages/php/ext-pdo_mysql-config.m4.patch | 13 +++++++++++++
 packages/php/php-mysql.subpackage.sh       |  3 +++
 4 files changed, 31 insertions(+)
 create mode 100644 packages/php/ext-mysqli-config.m4.patch
 create mode 100644 packages/php/ext-pdo_mysql-config.m4.patch
 create mode 100644 packages/php/php-mysql.subpackage.sh

diff --git a/packages/php/build.sh b/packages/php/build.sh
index d3f58e5a..6376ee8c 100644
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -35,12 +35,17 @@ ac_cv_func_res_nsearch=no
 --with-zlib
 --with-pgsql=shared,$TERMUX_PREFIX
 --with-pdo-pgsql=shared,$TERMUX_PREFIX
+--with-mysqli=shared,$TERMUX_PREFIX/bin/mysql_config
+--with-pdo-mysql=shared,$TERMUX_PREFIX/bin/mysql
+--with-mysql-sock=$TERMUX_PREFIX/tmp/mysqld.sock
 --with-apxs2=$TERMUX_PREFIX/bin/apxs
 --enable-fpm
 --sbindir=$TERMUX_PREFIX/bin
 "
 
 termux_step_pre_configure () {
+	#because the new mariadb hides away all these includes inside server subdir
+	CFLAGS+=" -I$TERMUX_PREFIX/include/mysql/server -I$TERMUX_PREFIX/include/mysql"
 	LDFLAGS+=" -landroid-glob -llog"
 
 	export PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/
diff --git a/packages/php/ext-mysqli-config.m4.patch b/packages/php/ext-mysqli-config.m4.patch
new file mode 100644
index 00000000..5f4fc806
--- /dev/null
+++ b/packages/php/ext-mysqli-config.m4.patch
@@ -0,0 +1,10 @@
+--- ./ext/mysqli/config.m4	2017-10-25 12:34:36.000000000 +0530
++++ ./ext/mysqli/config.m4	2017-11-07 21:59:15.529313719 +0530
+@@ -120,6 +120,7 @@
+                   mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
+                   mysqli_exception.c mysqli_result_iterator.c $mysqli_extra_sources"
+   PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
++  PHP_ADD_LIBRARY(mariadb,, MYSQLI_SHARED_LIBADD)
+   PHP_SUBST(MYSQLI_SHARED_LIBADD)
+   PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h])
+ 
diff --git a/packages/php/ext-pdo_mysql-config.m4.patch b/packages/php/ext-pdo_mysql-config.m4.patch
new file mode 100644
index 00000000..779071b4
--- /dev/null
+++ b/packages/php/ext-pdo_mysql-config.m4.patch
@@ -0,0 +1,13 @@
+diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
+index c165fb6..2c42f3a 100755
+--- a/ext/pdo_mysql/config.m4
++++ b/ext/pdo_mysql/config.m4
+@@ -166,6 +166,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then
+   ])
+   PDO_MYSQL_MODULE_TYPE=external
+ 
++  PHP_ADD_LIBRARY(mariadb,, PDO_MYSQL_SHARED_LIBADD)
++
+   PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)
+   PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE)
+ fi
diff --git a/packages/php/php-mysql.subpackage.sh b/packages/php/php-mysql.subpackage.sh
new file mode 100644
index 00000000..20f29ea2
--- /dev/null
+++ b/packages/php/php-mysql.subpackage.sh
@@ -0,0 +1,3 @@
+TERMUX_SUBPKG_INCLUDE="lib/php/mysqli.so lib/php/pdo_mysql.so"
+TERMUX_SUBPKG_DEPENDS="php, mariadb"
+TERMUX_SUBPKG_DESCRIPTION="MySQL modules for PHP"
-- 
2.11.0