diff --git a/packages/php/build.sh b/packages/php/build.sh index a4594b561..ffdab70bc 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://php.net TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language" TERMUX_PKG_VERSION=7.1.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=01584dc521ab7ec84b502b61952f573652fe6aa00c18d6d844fb9209f14b245b # 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 9d2b4b342..5114230a3 100644 --- a/packages/php/sapi-apache2handler-config.m4.patch +++ b/packages/php/sapi-apache2handler-config.m4.patch @@ -1,10 +1,12 @@ --- ./sapi/apache2handler/config.m4 2017-05-09 17:59:42.000000000 +0530 +++ ./sapi/apache2handler/config.m4 2017-06-08 21:10:39.847173781 +0530 -@@ -111,6 +111,7 @@ +@@ -111,6 +111,9 @@ INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *) -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lapr-1 -laprutil-1" ++ PHP_ADD_LIBRARY_WITH_PATH(apr-1, @TERMUX_PREFIX@, PHP7LIB_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(aprutil-1, @TERMUX_PREFIX@, PHP7LIB_SHARED_LIBADD) ++ PHP_SUBST(PHP7LIB_SHARED_LIBADD) 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" ;; @@ -28,3 +30,24 @@ if test -n "$APACHE_THREADED_MPM"; then enable_maintainer_zts=yes +--- ./sapi/apache2handler/config.m4 2017-06-14 08:17:02.760779119 +0530 ++++ ../config.m4 2017-06-14 08:25:58.653886169 +0530 +@@ -67,18 +67,9 @@ + fi + + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` +- if test -z `$APXS -q SYSCONFDIR`; then + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -i -n php7" +- else +- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` +- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ +- \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ +- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +- -S SYSCONFDIR='$APXS_SYSCONFDIR' \ +- -i -a -n php7" +- fi + + case $host_alias in + *aix*)