Skip to contentSkip to conversation

luajit: add option compat Lua 5.2

PATCH New Francois Perrad 2 participants 2 messages Dec 8, 2018 – Dec 9, 2018

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH 1/1 luajit: add option compat Lua 5.2

Signed-off-by Francois Perrad <[email protected]>
---
 package/luajit/Config.in | 5 +++++
 package/luajit/luajit.mk | 6 ++++++
 2 files changed, 11 insertions(+)
package/luajit/Config.in +5 -0
index 7e792c53c..33e38e7d4 100644
@@ -36,6 +36,11 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
 	default "5.1"
 
+config BR2_PACKAGE_LUAJIT_COMPAT52
+	bool "compat Lua 5.2"
+	help
+	  Compile with LUAJIT_ENABLE_LUA52COMPAT defined.
+
 endif
 
 comment "luajit needs a toolchain w/ dynamic library"
package/luajit/luajit.mk +6 -0
index 939fa660d..1406fbf4c 100644
@@ -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
Signature · 1 line
2.17.1
Applied
#1 lore raw

PATCH 1/1 luajit: add option compat Lua 5.2

Hello,

Quoted 5 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>
---
 package/luajit/Config.in | 5 +++++
 package/luajit/luajit.mk | 6 ++++++
 2 files changed, 11 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com