openRuyi-tutorials/buildroot
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/php: bump version to 8.5.2

Browse Source 
Release notes:
https://www.php.net/releases/8.5/en.php
https://news-web.php.net/php.announce/474
https://news-web.php.net/php.announce/475
https://news-web.php.net/php.announce/481

Rebased patches 0001-0003.

Removed patch 0005 due to the configure check being non-fatal now:
https://github.com/php/php-src/commit/e4078a6a70d5ad7896049bc19f3affe2fe806c24

opcache is not an optional dependency anymore:
https://github.com/php/php-src/commit/7b4c14dc10167b65ce51371507d7b37b74252077

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2026-01-19 22:31:57 +01:00
committed by Julien Olivain
parent 582bb85cdc
commit aedf131da6
8 changed files with 17 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.checkpackageignore
-1
View File
@@ -781,7 +781,6 @@ package/php/0001-acinclude.m4-don-t-unset-variables.patch lib_patch.Upstream
package/php/0002-iconv-tweak-iconv-detection.patch lib_patch.Upstream
package/php/0003-configure-disable-the-phar-tool.patch lib_patch.Upstream
package/php/0004-Call-apxs-with-correct-prefix.patch lib_patch.Upstream
package/php/0005-allow-opcache-cross-compiling.patch lib_patch.Upstream
package/pifmrds/0001-Makefile-cross-compile-friendly.patch lib_patch.Upstream
package/pifmrds/0002-Makefile-use-LDFLAGS.patch lib_patch.Upstream
package/pifmrds/0003-Makefile-fix-static-link.patch lib_patch.Upstream
package/php/0001-acinclude.m4-don-t-unset-variables.patch
+3 -3
View File
@@ -10,7 +10,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Adam Duskett <aduskett@gmail.com>
[aduskett@gmail.com: Update for 7.3.0]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Bernd: rebased for 8.4.13]
[Bernd: rebased for 8.5.2]
---
build/php.m4 | 4 ----
1 file changed, 4 deletions(-)
@@ -19,7 +19,7 @@ diff --git a/build/php.m4 b/build/php.m4
index e91ef988..9586c490 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -1462,8 +1462,6 @@ dnl PHP_CHECK_FUNC_LIB
@@ -1444,8 +1444,6 @@ dnl PHP_CHECK_FUNC_LIB
dnl
AC_DEFUN([PHP_CHECK_FUNC_LIB],[
ifelse($2,,:,[
@@ -28,7 +28,7 @@ index e91ef988..9586c490 100644
unset found
AC_CHECK_LIB($2, $1, [found=yes], [
AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
@@ -1496,8 +1496,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
@@ -1482,8 +1482,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
dnl HAVE_library if found and adds the library to LIBS.
dnl
AC_DEFUN([PHP_CHECK_FUNC],[
package/php/0002-iconv-tweak-iconv-detection.patch
+6 -6
View File
@@ -16,7 +16,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
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]
[Bernd: rebased for 8.5.2]
---
build/php.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -25,12 +25,12 @@ diff --git a/build/php.m4 b/build/php.m4
index 9586c490..8b3d47ed 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -1839,7 +1839,7 @@
@@ -1806,7 +1806,7 @@
php_brew_prefix=$($BREW --prefix 2> /dev/null)
fi
dnl Check external libs for iconv funcs.
AS_VAR_IF([found_iconv], [no], [
- for i in $PHP_ICONV /usr/local /usr; do
+ for i in $PHP_ICONV; do
- for i in $PHP_ICONV $php_brew_prefix/opt/libiconv /usr/local /usr; do
+ for i in $PHP_ICONV $php_brew_prefix/opt/libiconv; do
if test -r $i/include/gnu-libiconv/iconv.h; then
ICONV_DIR=$i
ICONV_INCLUDE_DIR=$i/include/gnu-libiconv
package/php/0003-configure-disable-the-phar-tool.patch
+2 -2
View File
@@ -13,7 +13,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Adam Duskett <aduskett@gmail.com>
[Aduskett: update for 8.0.7]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Bernd: rebased for 8.4.13]
[Bernd: rebased for 8.5.2]
---
configure.ac | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
@@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac
index 0dfab302..6026fb66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1585,13 +1585,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
@@ -1613,13 +1613,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
package/php/0005-allow-opcache-cross-compiling.patch
-42
View File
@@ -1,42 +0,0 @@
From 9bb316c41a69935ee2072626467241889594bed4 Mon Sep 17 00:00:00 2001
From: Adam Duskett <aduskett@gmail.com>
Date: Mon, 28 Jun 2021 11:12:36 -0700
Subject: [PATCH] allow opcache cross-compiling
Remove the check at the end of ext/opcache/config.m4 that prevents opcache from
being enabled in a cross-compiled environment. We pass the following as a
CFLAGS when opcache is enabled:
-DHAVE_SHM_IPC
-DHAVE_SHM_MMAP_ANON
-DHAVE_SHM_MMAP_ZERO
-DHAVE_SHM_MMAP_POSIX
-DHAVE_SHM_MMAP_FILE
Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Bernd: rebased for 8.4.13]
---
ext/opcache/config.m4 | 4 ----
1 file changed, 4 deletions(-)
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 5492fd92..10c150ff 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -346,13 +346,6 @@
PHP_ADD_EXTENSION_DEP(opcache, date)
PHP_ADD_EXTENSION_DEP(opcache, pcre)
- if test "$php_cv_shm_ipc" != "yes" && test "$php_cv_shm_mmap_posix" != "yes" && test "$php_cv_shm_mmap_anon" != "yes"; then
- AC_MSG_FAILURE(m4_text_wrap([
- No supported shared memory caching support was found when configuring
- opcache.
- ]))
- fi
-
AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
PHP_ADD_BUILD_DIR([
$ext_builddir/jit
--
2.31.1
package/php/Config.ext
-9
View File
@@ -10,15 +10,6 @@ config BR2_PACKAGE_PHP_EXT_FILEINFO
help
File Information support
comment "OPcache needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
config BR2_PACKAGE_PHP_EXT_OPCACHE
bool "OPcache"
depends on !BR2_STATIC_LIBS
help
Enable the Zend OPcache accelerator.
comment "Readline needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
package/php/php.hash
+1 -1
View File
@@ -1,5 +1,5 @@
# From https://www.php.net/downloads.php?source=Y
sha256 28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa php-8.4.17.tar.xz
sha256 cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1 php-8.5.2.tar.xz
# License file
sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE
package/php/php.mk
+5 -8
View File
@@ -4,7 +4,7 @@
#
################################################################################
PHP_VERSION = 8.4.17
PHP_VERSION = 8.5.2
PHP_SITE = https://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
@@ -26,9 +26,11 @@ PHP_CONF_OPTS = \
--with-external-pcre \
--without-pear \
--with-config-file-path=/etc \
--disable-opcache-jit \
--disable-phpdbg \
--disable-rpath
PHP_CONF_ENV = \
ac_cv_func_mprotect=yes \
EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
ifeq ($(BR2_STATIC_LIBS),y)
@@ -78,16 +80,12 @@ PHP_CXXFLAGS = $(TARGET_CXXFLAGS)
# The OPcache extension isn't cross-compile friendly
# Throw some defines here to avoid patching heavily
ifeq ($(BR2_PACKAGE_PHP_EXT_OPCACHE),y)
PHP_CONF_OPTS += --enable-opcache --disable-opcache-jit
PHP_CONF_ENV += ac_cv_func_mprotect=yes
PHP_CFLAGS += \
-DHAVE_SHM_IPC \
-DHAVE_SHM_MMAP_ANON \
-DHAVE_SHM_MMAP_ZERO \
-DHAVE_SHM_MMAP_POSIX \
-DHAVE_SHM_MMAP_FILE
endif
# We need to force dl "detection"
ifeq ($(BR2_STATIC_LIBS),)
@@ -358,9 +356,8 @@ define PHP_INSTALL_FIXUP
$(TARGET_DIR)/etc/php.ini
$(SED) 's%;date.timezone =.*%date.timezone = $(PHP_LOCALTIME)%' \
$(TARGET_DIR)/etc/php.ini
$(if $(BR2_PACKAGE_PHP_EXT_OPCACHE),
$(SED) '/;extension=php_xsl.dll/azend_extension=opcache.so' \
$(TARGET_DIR)/etc/php.ini)
$(SED) '/;extension=php_xsl.dll/azend_extension=opcache.so' \
$(TARGET_DIR)/etc/php.ini
endef
PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP