php: New attempt at avoid-linking-apr-everywhere

This commit is contained in:
Fredrik Fornwall
2017-06-15 00:32:26 +02:00
parent c4e120883c
commit a2bea6da61
3 changed files with 34 additions and 32 deletions

View File

@@ -1,37 +1,5 @@
--- ./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,9 @@
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*)
+ 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"
;;
@@ -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
--- ./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
@@ -51,3 +19,12 @@
case $host_alias in
*aix*)
@@ -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