Skip to contentSkip to conversation

package/lua: fix BR2_PACKAGE_LUA_32BITS for Lua5.4

PATCH New [email protected] 1 participant 1 message Jun 29

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/lua: fix BR2_PACKAGE_LUA_32BITS for Lua5.4

From: Daniel Kipshagen <[email protected]>

Lua 5.4 changed the way 32 bit lua is configured to define LUA_32BITS as 0 by default instead of leaving it commented out (see commit dee6433a89b088a1f8da9531a92a2a2693e5dac7 in lua project), which broke the sed in lua.mk. This resulted in lua5.4 not being compiled as 32 bit.

This patch updates the sed to replace both versions of luaconf.h so that 32 bit is configured. Tested with luaconf.h from lua 5.3 and 5.4.

---
 package/lua/lua.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/lua/lua.mk +3 -1
index 269eafe4bb..bbff2f2e70 100644
@@ -67,7 +67,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_LUA_32BITS),y)
 define LUA_32BITS_LUACONF
-	$(SED) 's/\/\* #define LUA_32BITS \*\//#define LUA_32BITS/' $(@D)/src/luaconf.h
+	$(SED)  -e 's@/\* #define LUA_32BITS \*/@#define LUA_32BITS 1@' \
+		-e 's@#define LUA_32BITS[[:space:]]\+0@#define LUA_32BITS 1@' \
+		$(@D)/src/luaconf.h
 endef
 
 LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF
Signature · 6 lines
2.33.1.windows.1

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