Bernd Kuhls
a9e5cf6ac2
Release notes: https://www.php.net/releases/8.4/en.php Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_4 Removed patch 0006 which is included in this release, rebased remaining patches. php commit https://github.com/php/php-src/commit/1f847a0bdfea3f754e5d46f9e016ce2530e5d9a4 added a check on the httpd binary which requires STAGING_DIR being part of SBINDIR as reported by apxs, adjust apache.mk accordingly. Upstream commit https://github.com/php/php-src/commit/ea4e8d513cdd87c8ac28cd1ae06f7e814c83ae28 causes a build error with older uclibc-based toolchains when detecting copy_file_range, disable it by adding php_cv_func_copy_file_range=no to _CONF_ENV for uclibc-toolchains. Upstream commit https://github.com/php/php-src/commit/063213b1aebf3dcbaccd35a801d8c52775de24a2 changed the name of the cache variable ac_cv_have_pcre2_jit to php_cv_have_pcre2_jit. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
54 lines
2.2 KiB
Diff
54 lines
2.2 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 php"
|
|
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 8.0.7]
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
[Bernd: rebased for 8.4.13]
|
|
---
|
|
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
|
|
@@ -68,10 +68,12 @@
|
|
AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0],
|
|
[AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])
|
|
|
|
+ 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 php"
|
|
else
|
|
APXS_SYSCONFDIR='$(INSTALL_ROOT)'$($APXS -q SYSCONFDIR)
|
|
@@ -79,6 +81,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 php"
|
|
fi
|
|
|
|
--
|
|
2.5.0
|
|
|