picolisp: Update from 17.11.29 to 18.1.24

[termux-packages] / packages / php / build.sh

diff --git a/packages/php/build.sh b/packages/php/build.sh
index 6376ee8..e663240 100644 (file)
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -1,13 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://php.net
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
-TERMUX_PKG_VERSION=7.1.11
-TERMUX_PKG_SHA256=074093e9d7d21afedc5106904218a80a47b854abe368d2728ed22184c884893e
+TERMUX_PKG_VERSION=7.2.1
+TERMUX_PKG_SHA256=6c6cf82fda6660ed963821eb0525214bb3547e8e29f447b9c15b2d8e6efd8822
 TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
 # 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"
+# mysql modules were initially shared libs
+TERMUX_PKG_CONFLICTS="php-mysql"
+TERMUX_PKG_REPLACES="php-mysql"
 TERMUX_PKG_RM_AFTER_INSTALL="php/php/fpm"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -35,8 +38,8 @@ 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-mysqli=mysqlnd
+--with-pdo-mysql=mysqlnd
 --with-mysql-sock=$TERMUX_PREFIX/tmp/mysqld.sock
 --with-apxs2=$TERMUX_PREFIX/bin/apxs
 --enable-fpm
@@ -44,8 +47,6 @@ ac_cv_func_res_nsearch=no
 "
 
 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/