b4d8147a95
On both Buildroot 2025.02.x and master branch, php-lua build fails on
the following error:
lua.c:862:44: error: assignment to 'zend_object_write_property_t' {aka
'struct _zval_struct * (*)(struct _zend_object *, struct _zend_string *,
struct _zval_struct *, void **)'} from incompatible pointer type 'void
(*)(zval *, zval *, zval *, void **)' {aka 'void (*)(struct _zval_struct
*, struct _zval_struct *, struct _zval_struct *, void **)'}
[-Wincompatible-pointer-types]
862 | lua_object_handlers.write_property =
php_lua_write_property;
| ^
lua.c:863:44: error: assignment to 'zend_object_read_property_t' {aka
'struct _zval_struct * (*)(struct _zend_object *, struct _zend_string *,
int, void **, struct _zval_struct *)'} from incompatible pointer type
'zval * (*)(zval *, zval *, int, void **, zval *)' {aka 'struct
_zval_struct * (*)(struct _zval_struct *, struct _zval_struct *, int,
void **, struct _zval_struct *)'} [-Wincompatible-pointer-types]
863 | lua_object_handlers.read_property =
php_lua_read_property;
| ^
make[2]: *** [Makefile:214: lua.lo] Error 1
The error can be reproduced with the following minimal defconfig:
BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_ARM_FPU_NEON=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_LUA=y
This build failure is the result of two events/conditions:
- the update to PHP8 has changed the prototype for
zend_object_read_property_t (see [1]). But at this time, php-lua just
generated a new warning (-Wincompatible-pointer-types)
- using bootlin bleeding-edge toolchain brings in GCC14, which now turns
this warning into a systematic error (see [2])
This issue is still present on the upstream repository, but it has been
fixed on one of its forks. Bring the relevant patch from the fork to
allow building php-lua.
[1] https://github.com/php/php-src/commit/91ef4124e56
[2] https://gcc.gnu.org/gcc-14/porting_to.html#incompatible-pointer-types
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
[Romain: update Upstream link]
Signed-off-by: Romain Naour <romain.naour@smile.fr>
78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
From de1068d634519abf2461dac9427b5ff24b6603af Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Galanin <mikhail.galanin@team.bumble.com>
|
|
Date: Tue, 24 Aug 2021 08:28:47 +0100
|
|
Subject: [PATCH] php8: Signature of write_property/read_property was changed
|
|
in https://github.com/php/php-src/commit/91ef4124e56
|
|
|
|
Upstream: upstream dead, taken from fork at https://github.com/badoo/php-lua/pull/8
|
|
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
|
|
---
|
|
lua.c | 28 ++++++++++++++--------------
|
|
1 file changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/lua.c b/lua.c
|
|
index edc2868..32c1471 100755
|
|
--- a/lua.c
|
|
+++ b/lua.c
|
|
@@ -229,46 +229,46 @@ zend_object *php_lua_create_object(zend_class_entry *ce)
|
|
|
|
/** {{{ static zval * php_lua_read_property(zval *object, zval *member, int type)
|
|
*/
|
|
-zval *php_lua_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv){
|
|
- lua_State *L = (Z_LUAVAL_P(object))->L;
|
|
- zend_string *str_member;
|
|
+zval *php_lua_read_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv){
|
|
+ lua_State *L = php_lua_obj_from_obj(object)->L;
|
|
|
|
if (type != BP_VAR_R) {
|
|
ZVAL_NULL(rv);
|
|
return rv;
|
|
}
|
|
|
|
- str_member = zval_get_string(member);
|
|
#if (LUA_VERSION_NUM < 502)
|
|
- lua_getfield(L, LUA_GLOBALSINDEX, ZSTR_VAL(str_member));
|
|
+ lua_getfield(L, LUA_GLOBALSINDEX, ZSTR_VAL(member));
|
|
#else
|
|
- lua_getglobal(L, ZSTR_VAL(str_member));
|
|
+ lua_getglobal(L, ZSTR_VAL(member));
|
|
#endif
|
|
- zend_string_release(str_member);
|
|
|
|
- php_lua_get_zval_from_lua(L, -1, object, rv);
|
|
+ zval lua_zval_object;
|
|
+ ZVAL_OBJ(&lua_zval_object, object);
|
|
+
|
|
+ php_lua_get_zval_from_lua(L, -1, &lua_zval_object, rv);
|
|
lua_pop(L, 1);
|
|
+
|
|
return rv;
|
|
}
|
|
/* }}} */
|
|
|
|
/** {{{ static void php_lua_write_property(zval *object, zval *member, zval *value)
|
|
*/
|
|
-static void php_lua_write_property(zval *object, zval *member, zval *value, void ** key) {
|
|
- lua_State *L = (Z_LUAVAL_P(object))->L;
|
|
- zend_string *str_member = zval_get_string(member);
|
|
+static zval* php_lua_write_property(zend_object *object, zend_string *member, zval *value, void ** key) {
|
|
+ lua_State *L = php_lua_obj_from_obj(object)->L;
|
|
|
|
#if (LUA_VERSION_NUM < 502)
|
|
- php_lua_send_zval_to_lua(L, member);
|
|
+ lua_pushlstring(L, ZSTR_VAL(val), ZSTR_LEN(val));
|
|
php_lua_send_zval_to_lua(L, value);
|
|
|
|
lua_settable(L, LUA_GLOBALSINDEX);
|
|
#else
|
|
php_lua_send_zval_to_lua(L, value);
|
|
- lua_setglobal(L, Z_STRVAL_P(member));
|
|
+ lua_setglobal(L, ZSTR_VAL(member));
|
|
#endif
|
|
|
|
- zend_string_release(str_member);
|
|
+ return value;
|
|
}
|
|
/* }}} */
|
|
|