From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch (limited to 'dev-db/redis/files') diff --git a/dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch b/dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch new file mode 100644 index 000000000000..968fc865da86 --- /dev/null +++ b/dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch @@ -0,0 +1,47 @@ +Backported from https://github.com/openresty/lua-cjson + +Upstream-commit: 638ac2741a7f ("optimize: improved forward-compatibility with older versions of Lua/LuaJIT.") +Link: https://github.com/openresty/lua-cjson/commit/638ac2741a7f274979ac3fe2e1ea5fd6487702fe +Upstream-PR: https://github.com/openresty/lua-cjson/pull/32 +See-also: https://www.freelists.org/post/luajit/ANN-LuaJIT210beta3,3 + +diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c +index c26c0d7b8..af9e4ca54 100644 +--- a/deps/lua/src/lua_cjson.c ++++ b/deps/lua/src/lua_cjson.c +@@ -1293,11 +1293,13 @@ static int json_decode(lua_State *l) + /* ===== INITIALISATION ===== */ + + #if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502 +-/* Compatibility for Lua 5.1. ++/* Compatibility for Lua 5.1 and older LuaJIT. + * +- * luaL_setfuncs() is used to create a module table where the functions have +- * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */ +-static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) ++ * compat_luaL_setfuncs() is used to create a module table where the functions ++ * have json_config_t as their first upvalue. Code borrowed from Lua 5.2 ++ * source's luaL_setfuncs(). ++ */ ++static void compat_luaL_setfuncs(lua_State *l, const luaL_Reg *reg, int nup) + { + int i; + +@@ -1310,6 +1312,8 @@ static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) + } + lua_pop(l, nup); /* remove upvalues */ + } ++#else ++#define compat_luaL_setfuncs(L, reg, nup) luaL_setfuncs(L, reg, nup) + #endif + + /* Call target function in protected mode with all supplied args. +@@ -1365,7 +1369,7 @@ static int lua_cjson_new(lua_State *l) + + /* Register functions with config data as upvalue */ + json_create_config(l); +- luaL_setfuncs(l, reg, 1); ++ compat_luaL_setfuncs(l, reg, 1); + + /* Set cjson.null */ + lua_pushlightuserdata(l, NULL); -- cgit v1.2.3