X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/6b78878e05f07253cf56d8329d052330780e69bf..4e8cd0103307f1bd7c70825d550341f8d7236853:/packages/php/build.sh

diff --git a/packages/php/build.sh b/packages/php/build.sh
index a4594b56..d450d685 100644
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -1,17 +1,14 @@
 TERMUX_PKG_HOMEPAGE=https://php.net
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
-TERMUX_PKG_VERSION=7.1.6
+TERMUX_PKG_VERSION=7.1.12
+TERMUX_PKG_SHA256=a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3
 TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=01584dc521ab7ec84b502b61952f573652fe6aa00c18d6d844fb9209f14b245b
 # Build native php for phar to build (see pear-Makefile.frag.patch):
 TERMUX_PKG_HOSTBUILD=true
 # Build the native php without xml support as we only need phar:
 TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-libxml --disable-dom --disable-simplexml --disable-xml --disable-xmlreader --disable-xmlwriter --without-pear"
 TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre, libbz2, libcrypt, libcurl, libgd, readline, freetype"
 TERMUX_PKG_RM_AFTER_INSTALL="php/php/fpm"
-# Building with clang causes gettype(-1) to return "double" instead of "integer".
-# See https://github.com/termux/termux-packages/issues/890
-TERMUX_PKG_CLANG=no
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_func_res_nsearch=no
@@ -38,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/