summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Yelloz <jordan@yelloz.me>2016-07-24 16:27:36 -0700
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-10-25 13:46:52 +0200
commit515ced20087407189bc5523a2bf7c19b239cb78d (patch)
tree0c125f8ea64c9e4a7a4c1fe10f4ebccc4099a74b
parent1b0df8f23c690d9464d82f4d3e57fe2a334b5d98 (diff)
downloadbuildroot-515ced20087407189bc5523a2bf7c19b239cb78d.tar.gz
buildroot-515ced20087407189bc5523a2bf7c19b239cb78d.zip
swupdate: allow luajit to enable HAVE_LUA
Until now, HAVE_LUA=y was only passed when BR2_PACKAGE_LUA=y. However, swupdate can also use LuaJIT instead of the classic Lua. Therefore, this commit updates the package to use BR2_PACKAGE_HAS_LUAINTERPRETER and the luainterpreter virtual package. Note that the swupdate configuration needs to be updated separately (via swupdate-menuconfig) to enable Lua support, and to specify the Lua version (which should be jit-5.1 to link against LuaJIT). Signed-off-by: Jordan Yelloz <jordan@yelloz.me> [Thomas: use the luainterpreter virtual package, expand commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/swupdate/swupdate.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk
index 313a54febd..d442810b21 100644
--- a/package/swupdate/swupdate.mk
+++ b/package/swupdate/swupdate.mk
@@ -39,8 +39,8 @@ else
SWUPDATE_MAKE_ENV += HAVE_LIBCURL=n
endif
-ifeq ($(BR2_PACKAGE_LUA),y)
-SWUPDATE_DEPENDENCIES += lua host-pkgconf
+ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
+SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf
SWUPDATE_MAKE_ENV += HAVE_LUA=y
else
SWUPDATE_MAKE_ENV += HAVE_LUA=n
OpenPOWER on IntegriCloud