From d95cb8ce3836cc4e53603d8f51bf268347a54a04 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 2 May 2022 19:17:54 -0600 Subject: [PATCH] package/luajit: depend on !BR2_PACKAGE_LUA We can't enable lua and luajit at the same time as they both provide the virtual luainterpreter package. Fixes: package/luajit/luajit.mk:80: *** Configuration error: both "luajit" and "lua" are selected as providers for virtual package "luainterpreter". Only one provider can be selected at a time. Please fix your configuration. Stop. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e11431dd611bd3f9f23a2fc48f3b077d35073b9d) Signed-off-by: Peter Korsgaard --- package/luajit/Config.in | 2 ++ package/snort3/Config.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/luajit/Config.in b/package/luajit/Config.in index 3111a2548f..f27099e80c 100644 --- a/package/luajit/Config.in +++ b/package/luajit/Config.in @@ -14,6 +14,8 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS config BR2_PACKAGE_LUAJIT bool "luajit" depends on !BR2_STATIC_LIBS # dlopen + # Luajit conflicts with the regular lua package + depends on !BR2_PACKAGE_LUA # Luajit is only available for some target architectures, and # has some complexity wrt 32/64. See luajit.mk for details. depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS diff --git a/package/snort3/Config.in b/package/snort3/Config.in index dcc29b820a..9b96e7cb58 100644 --- a/package/snort3/Config.in +++ b/package/snort3/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SNORT3 bool "snort3" + depends on !BR2_PACKAGE_LUA # luajit depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit depends on !(BR2_PACKAGE_DAQ || BR2_PACKAGE_SNORT) depends on BR2_USE_MMU # fork() @@ -34,6 +35,7 @@ config BR2_PACKAGE_SNORT3 https://www.snort.org/snort3 comment "snort3 needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.9" + depends on !BR2_PACKAGE_LUA depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on !(BR2_PACKAGE_DAQ || BR2_PACKAGE_SNORT) depends on BR2_USE_MMU