diff --git a/packages/php/build.sh b/packages/php/build.sh index 67702a235b..f71786d35f 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -3,13 +3,11 @@ TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language" TERMUX_PKG_LICENSE="PHP-3.01" TERMUX_PKG_LICENSE_FILE=LICENSE TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=8.0.6 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_VERSION=8.0.12 TERMUX_PKG_SRCURL=https://github.com/php/php-src/archive/php-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=ddf7a059cf5cd26d00bc5493f1ca2242172408c0dcc4acdba6ef8952f8bb5a38 +TERMUX_PKG_SHA256=889cfbd76ffdde521ac093605e17dacb34cc0734b2bbedd466ee00d224746b6c # Build native php for phar to build (see pear-Makefile.frag.patch): TERMUX_PKG_HOSTBUILD=true -TERMUX_PKG_BLACKLISTED_ARCHES="x86_64" # 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 --disable-sqlite3 --without-libxml --without-sqlite3 --without-pdo-sqlite" TERMUX_PKG_DEPENDS="freetype, libandroid-glob, libandroid-support, libbz2, libcrypt, libcurl, libgd, libgmp, libiconv, liblzma, libsqlite, libxml2, libxslt, libzip, oniguruma, openssl, pcre2, readline, zlib, libicu, libffi, tidy, zstd" @@ -65,6 +63,7 @@ termux_step_pre_configure() { export PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/ export NATIVE_PHP_EXECUTABLE=$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/php + export NATIVE_MINILUA_EXECUTABLE=$TERMUX_PKG_HOSTBUILD_DIR/ext/opcache/minilua if [ "$TERMUX_ARCH" = "aarch64" ]; then CFLAGS+=" -march=armv8-a+crc" CXXFLAGS+=" -march=armv8-a+crc" diff --git a/packages/php/ext-opcache-jit-Makefile.frag.patch b/packages/php/ext-opcache-jit-Makefile.frag.patch new file mode 100644 index 0000000000..af2e917cb0 --- /dev/null +++ b/packages/php/ext-opcache-jit-Makefile.frag.patch @@ -0,0 +1,11 @@ +--- ./ext/opcache/jit/Makefile.frag 2021-10-19 16:01:52.000000000 +0530 ++++ ./ext/opcache/jit/Makefile.frag.mod 2021-11-04 21:30:56.583161008 +0530 +@@ -3,7 +3,7 @@ + $(CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@ + + $(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua +- $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc ++ $(NATIVE_MINILUA_EXECUTABLE) $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc + + $(builddir)/jit/zend_jit.lo: \ + $(builddir)/jit/zend_jit_x86.c \