diff --git a/package/php/0006-Zend-zend_call_stack.c-fix-build-without-pthread.patch b/package/php/0006-Zend-zend_call_stack.c-fix-build-without-pthread.patch deleted file mode 100644 index 10b0083655..0000000000 --- a/package/php/0006-Zend-zend_call_stack.c-fix-build-without-pthread.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c3e37c438a11d59d858fcc7b46eac00a8074972b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 Mar 2024 17:51:55 +0100 -Subject: [PATCH] Zend/zend_call_stack.c: fix build without pthread - -Fix the following build failure without pthread raised since version -8.3.0 and -https://github.com/php/php-src/commit/a11c8a30399e90c17c287b9656c0077bc5131c9c: - -/home/buildroot/instance-0/output-1/build/php-8.3.4/Zend/zend_call_stack.c:39:11: fatal error: pthread.h: No such file or directory - 39 | # include - | ^~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/a4ef648a9da50b26ed56d5d490e4cf5a1bfff970 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/php/php-src/pull/13843 ---- - Zend/zend_call_stack.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Zend/zend_call_stack.c b/Zend/zend_call_stack.c -index 97cbed9041..97de938a0f 100644 ---- a/Zend/zend_call_stack.c -+++ b/Zend/zend_call_stack.c -@@ -35,7 +35,8 @@ - # include - # endif - #endif /* ZEND_WIN32 */ --#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) -+#if (defined(HAVE_PTHREAD_GETATTR_NP) && defined(HAVE_PTHREAD_ATTR_GETSTACK)) || \ -+ defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) - # include - #endif - #ifdef __FreeBSD__ --- -2.43.0 - diff --git a/package/php/php.hash b/package/php/php.hash index 4378d7ed07..9b25eabd32 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 53c8386b2123af97626d3438b3e4058e0c5914cb74b048a6676c57ac647f5eae php-8.3.6.tar.xz +sha256 d53433c1ca6b2c8741afa7c524272e6806c1e895e5912a058494fea89988570a php-8.3.7.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 5b26ec90e2..ad2d901dfd 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.6 +PHP_VERSION = 8.3.7 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES