DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2026-02-14 05:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

php: handle php-apache properly (#1084)

Browse Source 
* php: handle php-apache properly

* fix other modules linking against apr
* fix php including httpd.conf

* php: update revision for php-apache
This commit is contained in:
Vishal Biswas
2017-06-14 17:00:48 +05:30
committed by Fredrik Fornwall
parent 86cb84490d
commit e6672754c2
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/php/sapi-apache2handler-config.m4.patch
View File

@@ -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*)