浏览代码

lxc: enable lua if package is selected

lua and python bindings were removed with the same patch:
https://patchwork.ozlabs.org/patch/367361. There is a real issue with
python but not with lua so enable it if lua is selected

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
[Thomas: simplify value passed to --with-lua-pc.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fabrice Fontaine 8 年之前
父节点
当前提交
c383856268
共有 1 个文件被更改,包括 12 次插入1 次删除
  1. 12 1
      package/lxc/lxc.mk

+ 12 - 1
package/lxc/lxc.mk

@@ -10,7 +10,7 @@ LXC_LICENSE = LGPLv2.1+
 LXC_LICENSE_FILES = COPYING
 LXC_DEPENDENCIES = libcap host-pkgconf
 LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
-	--disable-lua --disable-python --disable-werror \
+	--disable-python --disable-werror \
 	$(if $(BR2_PACKAGE_BASH),,--disable-bash)
 
 ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
@@ -20,4 +20,15 @@ else
 LXC_CONF_OPTS += --disable-seccomp
 endif
 
+ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
+LXC_CONF_OPTS += --enable-lua
+LXC_DEPENDENCIES += luainterpreter
+ifeq ($(BR2_PACKAGE_LUAJIT),y)
+# By default, lxc will only search for lua.pc
+LXC_CONF_OPTS += --with-lua-pc=luajit
+endif
+else
+LXC_CONF_OPTS += --disable-lua
+endif
+
 $(eval $(autotools-package))