diff --git a/packages/php/build.sh b/packages/php/build.sh index e1d333714..a2badf9c2 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -1,14 +1,14 @@ TERMUX_PKG_HOMEPAGE=https://php.net TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language" TERMUX_PKG_LICENSE="PHP-3.0" -TERMUX_PKG_VERSION=7.2.12 -TERMUX_PKG_SHA256=989c04cc879ee71a5e1131db867f3c5102f1f7565f805e2bb8bde33f93147fe1 +TERMUX_PKG_VERSION=7.3.1 +TERMUX_PKG_SHA256=cfe93e40be0350cd53c4a579f52fe5d8faf9c6db047f650a4566a2276bf33362 TERMUX_PKG_SRCURL=https://secure.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" +TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre2, libbz2, libcrypt, libcurl, libgd, readline, freetype" # mysql modules were initially shared libs TERMUX_PKG_CONFLICTS="php-mysql" TERMUX_PKG_REPLACES="php-mysql" @@ -30,13 +30,14 @@ ac_cv_func_res_nsearch=no --with-curl=$TERMUX_PREFIX --with-freetype-dir=$TERMUX_PREFIX --with-gd=$TERMUX_PREFIX ---with-iconv=$TERMUX_PREFIX +--without-iconv --with-libxml-dir=$TERMUX_PREFIX --with-openssl=$TERMUX_PREFIX --with-pcre-regex=$TERMUX_PREFIX --with-png-dir=$TERMUX_PREFIX --with-readline=$TERMUX_PREFIX --with-zlib +--without-libzip --with-pgsql=shared,$TERMUX_PREFIX --with-pdo-pgsql=shared,$TERMUX_PREFIX --with-mysqli=mysqlnd diff --git a/packages/php/ext-fileinfo-config.m4.patch b/packages/php/ext-fileinfo-config.m4.patch deleted file mode 100644 index fc1e87e35..000000000 --- a/packages/php/ext-fileinfo-config.m4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u -r ../php-5.6.15/ext/fileinfo/config.m4 ./ext/fileinfo/config.m4 ---- ../php-5.6.15/ext/fileinfo/config.m4 2015-10-29 05:55:01.000000000 -0400 -+++ ./ext/fileinfo/config.m4 2015-11-10 15:12:46.711364773 -0500 -@@ -46,6 +46,9 @@ - AC_MSG_RESULT(no) - AC_MSG_NOTICE(using libmagic strcasestr implementation) - libmagic_sources="$libmagic_sources libmagic/strcasestr.c" -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_MSG_NOTICE(cross compiling - assuming strcasestr works) - ]) - - PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) diff --git a/packages/php/ext-opcache-config.m4.patch b/packages/php/ext-opcache-config.m4.patch index c84f79d49..c5f185be8 100644 --- a/packages/php/ext-opcache-config.m4.patch +++ b/packages/php/ext-opcache-config.m4.patch @@ -1,50 +1,32 @@ -diff -u -r ../php-7.2.3/ext/opcache/config.m4 ./ext/opcache/config.m4 ---- ../php-7.2.3/ext/opcache/config.m4 2018-02-27 16:33:06.000000000 +0000 -+++ ./ext/opcache/config.m4 2018-03-10 23:38:51.259947633 +0000 -@@ -147,7 +147,9 @@ +diff -u -r ../php-7.3.1/ext/opcache/config.m4 ./ext/opcache/config.m4 +--- ../php-7.3.1/ext/opcache/config.m4 2019-01-08 13:55:52.000000000 +0000 ++++ ./ext/opcache/config.m4 2019-01-10 23:53:48.558906864 +0000 +@@ -145,7 +145,9 @@ } - ],dnl + ]])],[dnl AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) -- msg=yes,msg=no,msg=no) -+ msg=yes,msg=no, +- msg=yes],[msg=no],[msg=no]) ++ msg=yes],[msg=no], + AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) + msg=yes) AC_MSG_RESULT([$msg]) AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support) -@@ -358,7 +360,15 @@ +@@ -356,7 +358,12 @@ flock_type=linux AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -+], [ -+ AC_MSG_RESULT("no") -+], [ +-], [AC_MSG_RESULT("no")], [AC_MSG_RESULT([no])]) ++], [AC_MSG_RESULT("no")], [ + dnl cross-compiling; assume Linux + flock_type=linux + AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) + AC_MSG_RESULT("yes") +]) -+ AC_MSG_CHECKING("whether flock struct is BSD ordered") - AC_TRY_RUN([ -@@ -374,7 +384,13 @@ - flock_type=bsd - AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) - AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -+], [ -+ AC_MSG_RESULT("no") -+], [ -+ dnl cross-compiling; assume Linux -+ AC_MSG_RESULT("no") -+]) -+ - - if test "$flock_type" = "unknown"; then - AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) -@@ -417,6 +433,9 @@ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +@@ -416,6 +423,9 @@ Optimizer/zend_dump.c, shared,,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,,yes)