26c16e9d5b
patch 0005 has been sourced from upstream, and can be dropped when 7.4.3 is released. The mbstrings module used to use a bundled oniguruma library, but now uses an external one, hence the new dependency on this package for the mbstrings module. The hash of the license file has changed due to this change in the copyright year: -Copyright (c) 1999 - 2018 The PHP Group. All rights reserved. +Copyright (c) 1999 - 2019 The PHP Group. All rights reserved. Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
From 4342bdea7a1a21430ce0d051fa4387441166c473 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fabrice.fontaine@orange.com>
|
|
Date: Sun, 11 Dec 2016 23:12:46 +0100
|
|
Subject: [PATCH] Call apxs with correct prefix
|
|
|
|
php uses apache's apxs script from staging directory to install libphp
|
|
dynamic library and update /etc/apache2/httpd.conf in the staging and target
|
|
directories. Here is the full command line:
|
|
"apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules'
|
|
-S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7"
|
|
This does not work for target directory as apxs sets the full path of the
|
|
library and not the relative one. Indeed, apxs is smart enough to substitute
|
|
away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so
|
|
httpd.conf will only be correct in the staging directory.
|
|
To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
|
|
|
|
Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
|
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
[aduskett@gmail.com: Update for 7.3.0]
|
|
---
|
|
sapi/apache2handler/config.m4 | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
|
|
index 55c16179..68ce66c0 100644
|
|
--- a/sapi/apache2handler/config.m4
|
|
+++ b/sapi/apache2handler/config.m4
|
|
@@ -63,10 +63,12 @@ if test "$PHP_APXS2" != "no"; then
|
|
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
|
|
fi
|
|
|
|
+ APXS_PREFIX='$(INSTALL_ROOT)'/usr
|
|
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
|
if test -z `$APXS -q SYSCONFDIR`; then
|
|
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
+ -S PREFIX='$APXS_PREFIX' \
|
|
-i -n php7"
|
|
else
|
|
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
|
|
@@ -74,6 +76,7 @@ if test "$PHP_APXS2" != "no"; then
|
|
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
|
|
+ -S PREFIX='$APXS_PREFIX' \
|
|
-i -a -n php7"
|
|
fi
|
|
|
|
--
|
|
2.5.0
|
|
|