package/luajit: add option to enable Lua 5.2 compatibility

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
[Thomas: formatting tweaks.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index 7e792c53c444d44694fd8d8a4a945bedee57192f..88c5bcbf28043610d557aea2547355e6df2de8ac 100644 (file)
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -36,6 +36,11 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
        default "5.1"
 
+config BR2_PACKAGE_LUAJIT_COMPAT52
+       bool "Lua 5.2 compatibility"
+       help
+         Compile with Lua 5.2 compatibility.
+
 endif
 
 comment "luajit needs a toolchain w/ dynamic library"

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 939fa660d86cc426d0e31810e94d8cdbd11a51dc..5b08a42d9861a4bbc580dae2226e53720e8e0b8c 100644 (file)
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -14,6 +14,10 @@ LUAJIT_INSTALL_STAGING = YES
 
 LUAJIT_PROVIDES = luainterpreter
 
+ifeq ($(BR2_PACKAGE_LUAJIT_COMPAT52),y)
+LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT
+endif
+
 ifeq ($(BR2_STATIC_LIBS),y)
 LUAJIT_BUILDMODE = static
 else
@@ -48,6 +52,7 @@ define LUAJIT_BUILD_CMDS
                HOST_CFLAGS="$(HOST_CFLAGS)" \
                HOST_LDFLAGS="$(HOST_LDFLAGS)" \
                BUILDMODE=$(LUAJIT_BUILDMODE) \
+               XCFLAGS=$(LUAJIT_XCFLAGS) \
                -C $(@D) amalg
 endef
 
@@ -68,6 +73,7 @@ LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK
 define HOST_LUAJIT_BUILD_CMDS
        $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" BUILDMODE=dynamic \
                TARGET_LDFLAGS="$(HOST_LDFLAGS)" \
+               XCFLAGS=$(LUAJIT_XCFLAGS) \
                -C $(@D) amalg
 endef