X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1a6cff7349434503283297cd7b1821fe23b776fc..66b555f9ef5b9c404c28746b84850c1c8c5509e7:/packages/php/build.sh

diff --git a/packages/php/build.sh b/packages/php/build.sh
index 83a83796..fbf33ac8 100644
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -1,15 +1,17 @@
 TERMUX_PKG_HOMEPAGE=https://php.net
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
-TERMUX_PKG_VERSION=7.1.3
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=7.1.6
 TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=e4887c2634778e37fd962fbdf5c4a7d32cd708482fe07b448804625570cb0bb0
+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
@@ -31,6 +33,7 @@ ac_cv_func_res_nsearch=no
 --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
 --with-pgsql=shared,$TERMUX_PREFIX
@@ -46,7 +49,6 @@ termux_step_pre_configure () {
 	export NATIVE_PHP_EXECUTABLE=$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/php
 
 	# Run autoconf since we have patched config.m4 files.
-	cd $TERMUX_PKG_SRCDIR
 	autoconf
 
 	export EXTENSION_DIR=$TERMUX_PREFIX/lib/php
@@ -54,13 +56,15 @@ termux_step_pre_configure () {
 
 termux_step_post_configure () {
 	# Avoid src/ext/gd/gd.c trying to include <X11/xpm.h>:
-	perl -p -i -e 's/#define HAVE_GD_XPM 1//' $TERMUX_PKG_BUILDDIR/main/php_config.h
+	sed -i 's/#define HAVE_GD_XPM 1//' $TERMUX_PKG_BUILDDIR/main/php_config.h
 	# Avoid src/ext/standard/dns.c trying to use struct __res_state:
-	perl -p -i -e 's/#define HAVE_RES_NSEARCH 1//' $TERMUX_PKG_BUILDDIR/main/php_config.h
+	sed -i 's/#define HAVE_RES_NSEARCH 1//' $TERMUX_PKG_BUILDDIR/main/php_config.h
 }
 
 termux_step_post_make_install () {
 	mkdir -p $TERMUX_PREFIX/etc/php-fpm.d
 	cp sapi/fpm/php-fpm.conf $TERMUX_PREFIX/etc/
 	cp sapi/fpm/www.conf $TERMUX_PREFIX/etc/php-fpm.d/
+
+	sed -i 's/SED=.*/SED=sed/' $TERMUX_PREFIX/bin/phpize
 }