diff --git a/packages/php/build.sh b/packages/php/build.sh index 9509ebc36..effffd58a 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -1,9 +1,8 @@ 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.3.2 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=010b868b4456644ae227d05ad236c8b0a1f57dc6320e7e5ad75e86c5baf0a9a8 +TERMUX_PKG_VERSION=7.3.3 +TERMUX_PKG_SHA256=6bb03e79a183d0cb059a6d117bbb2e0679cab667fb713a13c6a16f56bebab9b3 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 diff --git a/packages/php/ext-opcache-config.m4.patch b/packages/php/ext-opcache-config.m4.patch index 1673e2c70..a7d8f330b 100644 --- a/packages/php/ext-opcache-config.m4.patch +++ b/packages/php/ext-opcache-config.m4.patch @@ -12,40 +12,3 @@ diff -u -r ../php-7.3.2/ext/opcache/config.m4 ./ext/opcache/config.m4 AC_MSG_RESULT([$msg]) AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support) -@@ -347,22 +349,6 @@ - if test "$flock_type" = "unknown"; then - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include -- struct flock lock = { 1, 2, 3, 4, 5, 6, 7 }; -- int main() { -- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 6 && lock.l_len== 7) { -- return 0; -- } -- return 1; -- } --]])], [ -- flock_type=aix64 -- AC_DEFINE([HAVE_FLOCK_AIX64], [], [Struct flock is 64-bit AIX-type]) --], []) --fi -- --if test "$flock_type" = "unknown"; then --AC_RUN_IFELSE([AC_LANG_SOURCE([[ -- #include - struct flock lock = { 1, 2, 3, 4, 5 }; - int main() { - if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { -@@ -373,7 +359,12 @@ - ]])], [ - flock_type=linux - AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) --], []) -+], [], [ -+ dnl cross-compiling; assume Linux -+ flock_type=linux -+ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) -+ AC_MSG_RESULT("yes") -+]) - fi - - if test "$flock_type" = "unknown"; then