diff --git a/packages/php/build.sh b/packages/php/build.sh index 4e7d2882f..7eb2fa113 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -2,7 +2,7 @@ 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.4.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://secure.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=561bb866bdd509094be00f4ece7c3543ec971c4d878645ee81437e291cffc762 # Build native php for phar to build (see pear-Makefile.frag.patch): diff --git a/packages/php/sapi-apache2handler-config.m4.patch b/packages/php/sapi-apache2handler-config.m4.patch index ddd11b0eb..0cab80e88 100644 --- a/packages/php/sapi-apache2handler-config.m4.patch +++ b/packages/php/sapi-apache2handler-config.m4.patch @@ -1,5 +1,6 @@ ---- sapi/apache2handler/config.m4.orig 2019-12-28 22:30:23.046629391 +0000 -+++ ./sapi/apache2handler/config.m4 2019-12-28 22:31:10.687447649 +0000 +diff -uNr php-7.4.1/sapi/apache2handler/config.m4 php-7.4.1.mod/sapi/apache2handler/config.m4 +--- php-7.4.1/sapi/apache2handler/config.m4 2019-12-17 18:35:58.000000000 +0200 ++++ php-7.4.1.mod/sapi/apache2handler/config.m4 2020-01-02 01:08:05.368395459 +0200 @@ -64,18 +64,9 @@ fi @@ -19,3 +20,12 @@ case $host_alias in *aix*) +@@ -100,6 +91,8 @@ + INSTALL_IT="$INSTALL_IT $SAPI_SHARED" + ;; + *) ++ EXTRA_LDFLAGS="`$APR_CONFIG --ldflags --link-ld --libs`" ++ EXTRA_LDFLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $EXTRA_LDFLAGS" + PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) + INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" + ;;