package/php/0009-Call-apxs-with-correct-prefix.patch

   1 From 4342bdea7a1a21430ce0d051fa4387441166c473 Mon Sep 17 00:00:00 2001
   2 From: Fabrice Fontaine <fabrice.fontaine@orange.com>
   3 Date: Sun, 11 Dec 2016 23:12:46 +0100
   4 Subject: [PATCH] Call apxs with correct prefix
   5
   6 php uses apache's apxs script from staging directory to install libphp
   7 dynamic library and update /etc/apache2/httpd.conf in the staging and target
   8 directories. Here is the full command line:
   9 "apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules'
  10  -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7"
  11 This does not work for target directory as apxs sets the full path of the
  12 library and not the relative one. Indeed, apxs is smart enough to substitute
  13 away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so
  14 httpd.conf will only be correct in the staging directory.
  15 To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
  16
  17 Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
  18 ---
  19  sapi/apache2handler/config.m4 | 3 +++
  20  1 file changed, 3 insertions(+)
  21
  22 diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
  23 index 2e64b21..f5bf002 100644
  24 --- a/sapi/apache2handler/config.m4
  25 +++ b/sapi/apache2handler/config.m4
  26 @@ -66,10 +66,12 @@ if test "$PHP_APXS2" != "no"; then
  27      AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
  28    fi
  29
  30 +  APXS_PREFIX='$(INSTALL_ROOT)'/usr
  31    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
  32    if test -z `$APXS -q SYSCONFDIR`; then
  33      INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
  34                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
  35 +                       -S PREFIX='$APXS_PREFIX' \
  36                         -i -n php7"
  37    else
  38      APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
  39 @@ -77,6 +79,7 @@ if test "$PHP_APXS2" != "no"; then
  40                  \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
  41                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
  42                         -S SYSCONFDIR='$APXS_SYSCONFDIR' \
  43 +                       -S PREFIX='$APXS_PREFIX' \
  44                         -i -a -n php7"
  45    fi
  46
  47 --
  48 2.5.0
  49