1*4882a593SmuzhiyunFrom 4342bdea7a1a21430ce0d051fa4387441166c473 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fabrice.fontaine@orange.com> 3*4882a593SmuzhiyunDate: Sun, 11 Dec 2016 23:12:46 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Call apxs with correct prefix 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunphp uses apache's apxs script from staging directory to install libphp 7*4882a593Smuzhiyundynamic library and update /etc/apache2/httpd.conf in the staging and target 8*4882a593Smuzhiyundirectories. Here is the full command line: 9*4882a593Smuzhiyun"apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules' 10*4882a593Smuzhiyun -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php" 11*4882a593SmuzhiyunThis does not work for target directory as apxs sets the full path of the 12*4882a593Smuzhiyunlibrary and not the relative one. Indeed, apxs is smart enough to substitute 13*4882a593Smuzhiyunaway the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so 14*4882a593Smuzhiyunhttpd.conf will only be correct in the staging directory. 15*4882a593SmuzhiyunTo fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> 18*4882a593SmuzhiyunSigned-off-by: Adam Duskett <aduskett@gmail.com> 19*4882a593Smuzhiyun[aduskett@gmail.com: Update for 8.0.7] 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun sapi/apache2handler/config.m4 | 3 +++ 22*4882a593Smuzhiyun 1 file changed, 3 insertions(+) 23*4882a593Smuzhiyun 24*4882a593Smuzhiyundiff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 25*4882a593Smuzhiyunindex 55c16179..68ce66c0 100644 26*4882a593Smuzhiyun--- a/sapi/apache2handler/config.m4 27*4882a593Smuzhiyun+++ b/sapi/apache2handler/config.m4 28*4882a593Smuzhiyun@@ -63,10 +63,12 @@ if test "$PHP_APXS2" != "no"; then 29*4882a593Smuzhiyun AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) 30*4882a593Smuzhiyun fi 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun+ APXS_PREFIX='$(INSTALL_ROOT)'/usr 33*4882a593Smuzhiyun APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` 34*4882a593Smuzhiyun if test -z `$APXS -q SYSCONFDIR`; then 35*4882a593Smuzhiyun INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ 36*4882a593Smuzhiyun $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ 37*4882a593Smuzhiyun+ -S PREFIX='$APXS_PREFIX' \ 38*4882a593Smuzhiyun -i -n php" 39*4882a593Smuzhiyun else 40*4882a593Smuzhiyun APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` 41*4882a593Smuzhiyun@@ -74,6 +76,7 @@ if test "$PHP_APXS2" != "no"; then 42*4882a593Smuzhiyun \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ 43*4882a593Smuzhiyun $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ 44*4882a593Smuzhiyun -S SYSCONFDIR='$APXS_SYSCONFDIR' \ 45*4882a593Smuzhiyun+ -S PREFIX='$APXS_PREFIX' \ 46*4882a593Smuzhiyun -i -a -n php" 47*4882a593Smuzhiyun fi 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun-- 50*4882a593Smuzhiyun2.5.0 51*4882a593Smuzhiyun 52