X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/6b78878e05f07253cf56d8329d052330780e69bf..b70e9889d159f6e76e9715662816713f78c46319:/packages/php/sapi-apache2handler-config.m4.patch

diff --git a/packages/php/sapi-apache2handler-config.m4.patch b/packages/php/sapi-apache2handler-config.m4.patch
index 9d2b4b34..9c2c5961 100644
--- a/packages/php/sapi-apache2handler-config.m4.patch
+++ b/packages/php/sapi-apache2handler-config.m4.patch
@@ -1,13 +1,24 @@
 --- ./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"
-     ;;
+@@ -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*)
 @@ -122,7 +122,7 @@
        PHP_BUILD_THREAD_SAFE
      fi
@@ -17,14 +28,3 @@
      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