Skip to contentSkip to conversation

Update php

PATCH Applied Bernd Kuhls 2 participants 11 messages Jan 18 – Feb 6

lore
Share & tools
lore
#0 lore raw

cover Update php

Hi,

this series contains the bump to the latest php bugfix release of the 8.4 series, some version bumps which include compatibility with php 8.5, the removal of the unmaintainted php-zmq package and the bump of php to version 8.5.2.

Regards, Bernd

Bernd Kuhls (6):
package/php: bump version to 8.4.17
package/php-amqp: bump version to 2.2.0
package/php-imagick: bump version to 3.8.1
package/php-xdebug: bump version to 3.5.0
package/php-zmq: remove package
package/php: bump version to 8.5.2

 .checkpackageignore                           |   3 -
 Config.in.legacy                              |   7 +
 package/Config.in                             |   1 -
 package/php-amqp/php-amqp.hash                |   2 +-
 package/php-amqp/php-amqp.mk                  |   2 +-
 package/php-imagick/php-imagick.hash          |   2 +-
 package/php-imagick/php-imagick.mk            |   2 +-
 package/php-xdebug/php-xdebug.hash            |   2 +-
 package/php-xdebug/php-xdebug.mk              |   2 +-
 .../0001-updates-for-php7.4-and-php8.0.patch  | 230 ------------------
 package/php-zmq/0002-fix-for-php-7.3.patch    |  43 ----
 .../php-zmq/0003-fix-for-php-8.0.0beta2.patch |  40 ---
 package/php-zmq/Config.in                     |  12 -
 package/php-zmq/php-zmq.hash                  |   3 -
 package/php-zmq/php-zmq.mk                    |  25 --
 ...1-acinclude.m4-don-t-unset-variables.patch |   6 +-
 .../0002-iconv-tweak-iconv-detection.patch    |  12 +-
 ...0003-configure-disable-the-phar-tool.patch |   4 +-
 .../0005-allow-opcache-cross-compiling.patch  |  42 ----
 package/php/Config.ext                        |   9 -
 package/php/php.hash                          |   2 +-
 package/php/php.mk                            |  13 +-
 22 files changed, 30 insertions(+), 434 deletions(-)
 delete mode 100644 package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch
 delete mode 100644 package/php-zmq/0002-fix-for-php-7.3.patch
 delete mode 100644 package/php-zmq/0003-fix-for-php-8.0.0beta2.patch
 delete mode 100644 package/php-zmq/Config.in
 delete mode 100644 package/php-zmq/php-zmq.hash
 delete mode 100644 package/php-zmq/php-zmq.mk
 delete mode 100644 package/php/0005-allow-opcache-cross-compiling.patch
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 1/6 package/php: bump version to 8.4.17

Release notes: https://news-web.php.net/php.announce/480

Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_4

---
 package/php/php.hash | 2 +-
 package/php/php.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/php/php.hash +1 -1
index 4a9d2e4bb4..23ca842b72 100644
@@ -1,5 +1,5 @@
 # From https://www.php.net/downloads.php?source=Y
-sha256  f66f8f48db34e9e29f7bfd6901178e9cf4a1b163e6e497716dfcb8f88bcfae30  php-8.4.16.tar.xz
+sha256  28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa  php-8.4.17.tar.xz
 
 # License file
 sha256  b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a  LICENSE
package/php/php.mk +1 -1
index 7524187649..aa6050c1a7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_VERSION = 8.4.16
+PHP_VERSION = 8.4.17
 PHP_SITE = https://www.php.net/distributions
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH 1/6] package/php: bump version to 8.4.17

Quoted 5 lines · Bernd Kuhls

Release notes: https://news-web.php.net/php.announce/480

Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_4

Patch from 1 to 4 of this series applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw

Re: [Buildroot] [PATCH 1/6] package/php: bump version to 8.4.17

In reply to Bernd Kuhls

In reply of:

Quoted 5 lines

Release notes: https://news-web.php.net/php.announce/480

Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_4

Applied to 2025.11.x. Thanks

Quoted 36 lines
---
 package/php/php.hash | 2 +-
 package/php/php.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/php/php.hash +1 -1
index 4a9d2e4bb4..23ca842b72 100644
@@ -1,5 +1,5 @@
 # From https://www.php.net/downloads.php?source=Y
-sha256  f66f8f48db34e9e29f7bfd6901178e9cf4a1b163e6e497716dfcb8f88bcfae30  php-8.4.16.tar.xz
+sha256  28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa  php-8.4.17.tar.xz
 
 # License file
 sha256  b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a  LICENSE
package/php/php.mk +1 -1
index 7524187649..aa6050c1a7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_VERSION = 8.4.16
+PHP_VERSION = 8.4.17
 PHP_SITE = https://www.php.net/distributions
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#4 lore raw

PATCH 2/6 package/php-amqp: bump version to 2.2.0

In reply to Bernd Kuhls

https://pecl.php.net/package-changelog.php?package=amqp&release=2.2.0

---
 package/php-amqp/php-amqp.hash | 2 +-
 package/php-amqp/php-amqp.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/php-amqp/php-amqp.hash +1 -1
index 1c0938542c..22ed4ffb13 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  0cb16d63752a0055de55a22062a6c1744908696d92268d76181284669025d993  amqp-2.1.2.tgz
+sha256  5ae624bd785e299523f6132c204bd562cc73066dd33a10a12aa96389f55a4de7  amqp-2.2.0.tgz
 sha256  ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8  LICENSE
package/php-amqp/php-amqp.mk +1 -1
index 5507032ee1..f47c0ae874 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_AMQP_VERSION = 2.1.2
+PHP_AMQP_VERSION = 2.2.0
 PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz
 PHP_AMQP_SITE = https://pecl.php.net/get
 PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw

PATCH 3/6 package/php-imagick: bump version to 3.8.1

In reply to Bernd Kuhls

https://pecl.php.net/package-changelog.php?package=imagick&release=3.8.1

---
 package/php-imagick/php-imagick.hash | 2 +-
 package/php-imagick/php-imagick.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/php-imagick/php-imagick.hash +1 -1
index f6091c6b7e..fe6a80a6d2 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  bda67461c854f20d6105782b769c524fc37388b75d4481d951644d2167ffeec6  imagick-3.8.0.tgz
+sha256  3a3587c0a524c17d0dad9673a160b90cd776e836838474e173b549ed864352ee  imagick-3.8.1.tgz
 sha256  b6e00df9cb3b91977c0d64a7c4db48cb6f5041f6eeda6583c236775f70a35b78  LICENSE
package/php-imagick/php-imagick.mk +1 -1
index 0223b6ae93..d1ff69de6f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_IMAGICK_VERSION = 3.8.0
+PHP_IMAGICK_VERSION = 3.8.1
 PHP_IMAGICK_SOURCE = imagick-$(PHP_IMAGICK_VERSION).tgz
 PHP_IMAGICK_SITE = http://pecl.php.net/get
 PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw

PATCH 4/6 package/php-xdebug: bump version to 3.5.0

In reply to Bernd Kuhls

https://xdebug.org/announcements/2025-12-04

Cc Nicolas Carrier <[email protected]>
---
 package/php-xdebug/php-xdebug.hash | 2 +-
 package/php-xdebug/php-xdebug.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/php-xdebug/php-xdebug.hash +1 -1
index 9470a7d4e8..9149545a6e 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  7592923501e3fdb9741ad35b90e08fc6b3c5dd31eadc4c83b7b3c9dda0627b24  xdebug-3.4.7.tgz
+sha256  f6daf55a5c7adadb07dd2af25ff78b1cc9b1c58d6cc442a463eba015b678aabf  xdebug-3.5.0.tgz
 sha256  bc2aee27f3f0806be39e329d284ddbbfb14602a49af261df305dd6122d988eb0  LICENSE
package/php-xdebug/php-xdebug.mk +1 -1
index 272d331f7b..85a00d10fb 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_XDEBUG_VERSION = 3.4.7
+PHP_XDEBUG_VERSION = 3.5.0
 PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz
 PHP_XDEBUG_SITE = https://xdebug.org/files
 PHP_XDEBUG_INSTALL_STAGING = YES
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#7 lore raw

PATCH 5/6 package/php-zmq: remove package

In reply to Bernd Kuhls

Building php-zmq is broken with php 8.5.

Although some pull requests exist upstream to fix php 8.5 support:
https://github.com/zeromq/php-zmq/pulls

they do not fix other bugs like broken build with gcc 15.x which was the cause for the its removal by Debian:
https://tracker.debian.org/news/1668817/php-zmq-removed-from-testing/
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097580

According to various sources the package is unmaintained:
https://pecl.php.net/package/zmq
https://lists.zeromq.org/pipermail/zeromq-dev/2019-August/033109.html
https://github.com/zeromq/php-zmq/pull/240#issuecomment-3684566367

so we drop the package from buildroot.

---
 .checkpackageignore                           |   3 -
 Config.in.legacy                              |   7 +
 package/Config.in                             |   1 -
 .../0001-updates-for-php7.4-and-php8.0.patch  | 230 ------------------
 package/php-zmq/0002-fix-for-php-7.3.patch    |  43 ----
 .../php-zmq/0003-fix-for-php-8.0.0beta2.patch |  40 ---
 package/php-zmq/Config.in                     |  12 -
 package/php-zmq/php-zmq.hash                  |   3 -
 package/php-zmq/php-zmq.mk                    |  25 --
 9 files changed, 7 insertions(+), 357 deletions(-)
 delete mode 100644 package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch
 delete mode 100644 package/php-zmq/0002-fix-for-php-7.3.patch
 delete mode 100644 package/php-zmq/0003-fix-for-php-8.0.0beta2.patch
 delete mode 100644 package/php-zmq/Config.in
 delete mode 100644 package/php-zmq/php-zmq.hash
 delete mode 100644 package/php-zmq/php-zmq.mk
.checkpackageignore +0 -3
index b843a14882..76be145bbd 100644
@@ -777,9 +777,6 @@ package/perl-xml-libxml/0001-Makefile-PL.patch lib_patch.Upstream
 package/php-geoip/0001-add-build-support-for-php8.patch lib_patch.Upstream
 package/php-lua/0001-ZEND_ACC_ALLOW_STATIC-ZEND_ACC_STATIC-for-static-met.patch lib_patch.Upstream
 package/php-lua/0002-php8-explicitly-declare-arginfo.patch lib_patch.Upstream
-package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch lib_patch.Upstream
-package/php-zmq/0002-fix-for-php-7.3.patch lib_patch.Upstream
-package/php-zmq/0003-fix-for-php-8.0.0beta2.patch lib_patch.Upstream
 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
Config.in.legacy +7 -0
index 4502963b24..6be70dace8 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2026.02"
 
+config BR2_PACKAGE_PHP_ZMQ
+	bool "php-zmq removed"
+	select BR2_LEGACY
+	help
+	  php-zmq was no longer maintained upstream, broken with php 8.5,
+	  so it has been dropped.
+
 config BR2_PACKAGE_LOCKDEV
 	bool "lockdev removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index 6ce16bce0a..94ea56b297 100644
@@ -947,7 +947,6 @@ menu "External php extensions"
 	source "package/php-ssh2/Config.in"
 	source "package/php-xdebug/Config.in"
 	source "package/php-yaml/Config.in"
-	source "package/php-zmq/Config.in"
 endmenu
 endif
 if BR2_STATIC_LIBS
package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch deleted +0 -230

230 lines not on this page · raw message

package/php-zmq/0002-fix-for-php-7.3.patch deleted +0 -43

43 lines not on this page · raw message

package/php-zmq/0003-fix-for-php-8.0.0beta2.patch deleted +0 -40
deleted file mode 100644
index c5aab16ab7..0000000000
@@ -1,40 +0,0 @@
-From f0993f1fe973c4d359323ad1897ed7aa74f7e015 Mon Sep 17 00:00:00 2001
-From: Remi Collet <[email protected]>
-Date: Mon, 24 Aug 2020 15:55:54 +0200
-Subject: [PATCH] fix for PHP 8.0.0beta2
-
-Signed-off-by: Remi Collet <[email protected]>
-Signed-off-by: Adam Duskett <[email protected]>
----
- zmq.c        | 2 ++
- zmq_device.c | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/zmq.c b/zmq.c
-index 89902f9..bd2401d 100644
---- a/zmq.c
-+++ b/zmq.c
-@@ -621,7 +621,9 @@ zend_bool php_zmq_connect_callback(zval *socket, zend_fcall_info *fci, zend_fcal
- 	fci->params         = params;
- 	fci->param_count    = 2;
- 	fci->retval         = &retval;
-+#if PHP_VERSION_ID < 80000
- 	fci->no_separation  = 1;
-+#endif
- 
- 	if (zend_call_function(fci, fci_cache) == FAILURE) {
- 		if (!EG(exception)) {
-diff --git a/zmq_device.c b/zmq_device.c
-index 534f966..1c6aa3e 100644
---- a/zmq_device.c
-+++ b/zmq_device.c
-@@ -53,7 +53,9 @@ zend_bool s_invoke_device_cb (php_zmq_device_cb_t *cb, uint64_t current_ts)
- 	cb->fci.param_count = 1;
- 
- 	/* Call the cb */
-+#if PHP_VERSION_ID < 80000
- 	cb->fci.no_separation  = 1;
-+#endif
- 	cb->fci.retval         = &fc_retval;
- 
- 	if (zend_call_function(&(cb->fci), &(cb->fci_cache)) == FAILURE) {
package/php-zmq/Config.in deleted +0 -12
deleted file mode 100644
index 37be17792a..0000000000
@@ -1,12 +0,0 @@
-comment "php-zmq needs a toolchain w/ C++, threads"
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
-
-config BR2_PACKAGE_PHP_ZMQ
-	bool "php-zmq"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_ZEROMQ
-	help
-	  ZeroMQ messaging bindings for PHP
-
-	  http://pecl.php.net/package/zmq
package/php-zmq/php-zmq.hash deleted +0 -3
deleted file mode 100644
index a4cca69878..0000000000
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256  c492375818bd51b355352798fb94f04d6828c6aeda41ba813849624af74144ce  zmq-1.1.3.tgz
-sha256  0302303063d3612fc240032aeb6d70e9b7509fc17a4a9edf00eba091ed597514  LICENSE
package/php-zmq/php-zmq.mk deleted +0 -25
deleted file mode 100644
index fed71955b6..0000000000
@@ -1,25 +0,0 @@
-################################################################################
-#
-# php-zmq
-#
-################################################################################
-
-PHP_ZMQ_VERSION = 1.1.3
-PHP_ZMQ_SOURCE = zmq-$(PHP_ZMQ_VERSION).tgz
-PHP_ZMQ_SITE = https://pecl.php.net/get
-# phpize does the autoconf magic
-PHP_ZMQ_DEPENDENCIES = php zeromq host-autoconf host-pkgconf
-PHP_ZMQ_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config
-PHP_ZMQ_LICENSE = BSD-3-Clause
-PHP_ZMQ_LICENSE_FILES = LICENSE
-
-define PHP_ZMQ_PHPIZE
-	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
-		$(STAGING_DIR)/usr/bin/phpize)
-endef
-
-PHP_ZMQ_PRE_CONFIGURE_HOOKS += PHP_ZMQ_PHPIZE
-
-$(eval $(autotools-package))
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#8 lore raw

Re: [Buildroot] [PATCH 5/6] package/php-zmq: remove package

Hi Bernd,

Quoted 19 lines · Bernd Kuhls

Building php-zmq is broken with php 8.5.

Although some pull requests exist upstream to fix php 8.5 support:
https://github.com/zeromq/php-zmq/pulls

they do not fix other bugs like broken build with gcc 15.x which was the cause for the its removal by Debian:
https://tracker.debian.org/news/1668817/php-zmq-removed-from-testing/
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097580

According to various sources the package is unmaintained:
https://pecl.php.net/package/zmq
https://lists.zeromq.org/pipermail/zeromq-dev/2019-August/033109.html
https://github.com/zeromq/php-zmq/pull/240#issuecomment-3684566367

so we drop the package from buildroot.

---

[...]

Config.in.legacy endif · line 153

Quoted 13 lines
Config.in.legacy +5 -0
index 4502963b24..6be70dace8 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2026.02"
 
+config BR2_PACKAGE_PHP_ZMQ
+	bool "php-zmq removed"
+	select BR2_LEGACY
+	help
+	  php-zmq was no longer maintained upstream, broken with php 8.5,

The command "make check-package" is reporting an error here:
Config.in.legacy:153: help text: <tab><2 spaces><62 chars> (https://nightly.buildroot.org/#writing-rules-config-in)

Could you fix this error, please?

Config.in.legacy endif · line 158

Quoted 5 lines
Config.in.legacy +2 -0
+	  so it has been dropped.
+
 config BR2_PACKAGE_LOCKDEV
 	bool "lockdev removed"
 	select BR2_LEGACY

Best regards,

Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#9 lore raw

PATCH 6/6 package/php: bump version to 8.5.2

In reply to Bernd Kuhls

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

---
 ...1-acinclude.m4-don-t-unset-variables.patch |  6 +--
 .../0002-iconv-tweak-iconv-detection.patch    | 12 +++---
 ...0003-configure-disable-the-phar-tool.patch |  4 +-
 .../0005-allow-opcache-cross-compiling.patch  | 42 -------------------
 package/php/Config.ext                        |  9 ----
 package/php/php.hash                          |  2 +-
 package/php/php.mk                            | 13 +++---
 7 files changed, 17 insertions(+), 71 deletions(-)
 delete mode 100644 package/php/0005-allow-opcache-cross-compiling.patch
package/php/0001-acinclude.m4-don-t-unset-variables.patch +3 -3
index fe92fb4f55..0d8796e6dd 100644
@@ -10,7 +10,7 @@ Signed-off-by: Gustavo Zacarias <[email protected]>
 Signed-off-by: Adam Duskett <[email protected]>
 [[email protected]: Update for 7.3.0]
 Signed-off-by: Bernd Kuhls <[email protected]>
-[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
index 536a69fd18..afa9e7f26f 100644
@@ -16,7 +16,7 @@ Signed-off-by: Gustavo Zacarias <[email protected]>
 Signed-off-by: Adam Duskett <[email protected]>
 [[email protected]: Update for 8.0.7]
 Signed-off-by: Bernd Kuhls <[email protected]>
-[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
index ebde912861..6f977b5df0 100644
@@ -13,7 +13,7 @@ Signed-off-by: Gustavo Zacarias <[email protected]>
 Signed-off-by: Adam Duskett <[email protected]>
 [Aduskett: update for 8.0.7]
 Signed-off-by: Bernd Kuhls <[email protected]>
-[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 deleted +0 -42

42 lines not on this page · raw message

package/php/Config.ext +0 -9
index e6f29cdf4c..8948ff3484 100644
@@ -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
index 23ca842b72..6d13f11e56 100644
@@ -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
index aa6050c1a7..2c91ef7b63 100644
@@ -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
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#10 lore raw

Re: [Buildroot] [PATCH 6/6] package/php: bump version to 8.5.2

Hi Bernd,

Thanks for the patch.

Quoted 16 lines · Bernd Kuhls

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

---

[...]

package/php/0005-allow-opcache-cross-compiling.patch

Quoted 2 lines
package/php/0005-allow-opcache-cross-compiling.patch deleted +0 -0
deleted file mode 100644

The command "make check-package" is reporting an error
due to this removed file:
.checkpackageignore:784: ignored file package/php/0005-allow-opcache-cross-compiling.patch is missing

Could you fix this error, please?

package/php/0005-allow-opcache-cross-compiling.patch

Quoted 3 lines

index 1031b45f19..0000000000

package/php/0005-allow-opcache-cross-compiling.patch deleted +0 -0

[...]

Best regards,

Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot