Skip to content

[pull] master from buildroot:master #847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Feb 4, 2026
Merged

[pull] master from buildroot:master #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
995196e
package/php-lua: add comment for lua dependency
bkuhls Feb 3, 2026
533dd66
package/php-lua: add support for php >= 8.5
RomainNaour Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions package/php-lua/0005-add-support-for-php-8.5.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 2c8b642b70edf5b0602b10a25d3f04874e175276 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@smile.fr>
Date: Mon, 2 Feb 2026 22:12:48 +0100
Subject: [PATCH] add support for php >= 8.5

php removed zend_exception_get_default() and replaced by zend_ce_exception.

[1] https://github.com/php/php-src/commit/a812a74c2e60a0ba080057067a7634e4da3f2b9b

Upstream: upstream dead, custom patch
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
lua.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/lua.c b/lua.c
index 5889bc7..62f8f0a 100755
--- a/lua.c
+++ b/lua.c
@@ -871,7 +871,11 @@ PHP_MINIT_FUNCTION(lua) {

INIT_CLASS_ENTRY(ce, "LuaException", NULL);

+#if ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 5)) || (PHP_MAJOR_VERSION < 5)
lua_exception_ce = zend_register_internal_class_ex(&ce, zend_exception_get_default());
+#else
+ lua_exception_ce = zend_register_internal_class_ex(&ce, zend_ce_exception);
+#endif

return SUCCESS;
}
--
2.52.0

3 changes: 3 additions & 0 deletions package/php-lua/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ config BR2_PACKAGE_PHP_LUA
OO-API to lua variables and functions.

https://pecl.php.net/package/lua

comment "php-lua needs the lua interpreter"
depends on !BR2_PACKAGE_HAS_LUAINTERPRETER