From: Vishal Biswas <vshlbiswas@ymail.com>
Date: Mon, 12 Jun 2017 12:27:49 +0000 (+0530)
Subject: php-apache: add package (#1075)
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/6b78878e05f07253cf56d8329d052330780e69bf

php-apache: add package (#1075)
---

diff --git a/packages/php/build.sh b/packages/php/build.sh
index fbf33ac8..a4594b56 100644
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -38,6 +38,7 @@ ac_cv_func_res_nsearch=no
 --with-zlib
 --with-pgsql=shared,$TERMUX_PREFIX
 --with-pdo-pgsql=shared,$TERMUX_PREFIX
+--with-apxs2=$TERMUX_PREFIX/bin/apxs
 --enable-fpm
 --sbindir=$TERMUX_PREFIX/bin
 "
diff --git a/packages/php/php-apache.subpackage.sh b/packages/php/php-apache.subpackage.sh
new file mode 100644
index 00000000..0d055c45
--- /dev/null
+++ b/packages/php/php-apache.subpackage.sh
@@ -0,0 +1,3 @@
+TERMUX_SUBPKG_DESCRIPTION="Apache 2.0 Handler module for PHP"
+TERMUX_SUBPKG_DEPENDS="php, apache2"
+TERMUX_SUBPKG_INCLUDE="libexec/apache2/libphp7.so"
diff --git a/packages/php/sapi-apache2handler-config.m4.patch b/packages/php/sapi-apache2handler-config.m4.patch
new file mode 100644
index 00000000..9d2b4b34
--- /dev/null
+++ b/packages/php/sapi-apache2handler-config.m4.patch
@@ -0,0 +1,30 @@
+--- ./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 @@
+     INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
+     ;;
+   *)
++    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lapr-1 -laprutil-1"
+     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"
+     ;;
+@@ -122,7 +122,7 @@
+       PHP_BUILD_THREAD_SAFE
+     fi
+   else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
++    APACHE_THREADED_MPM=true
+     if test -n "$APACHE_THREADED_MPM"; then
+       PHP_BUILD_THREAD_SAFE
+     fi
+--- ./configure
++++ ./configure
+@@ -6932,7 +6932,7 @@
+ 
+     fi
+   else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
++    APACHE_THREADED_MPM=true
+     if test -n "$APACHE_THREADED_MPM"; then
+ 
+   enable_maintainer_zts=yes