@@ -474,52 +474,6 @@ menu "Interpreter languages and scripting"
source "package/lua/Config.in"
source "package/luainterpreter/Config.in"
source "package/luajit/Config.in"
-if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_STATIC_LIBS
-# lua modules are dynamically loaded, so not available on static builds
-menu "Lua libraries/modules"
- source "package/cgilua/Config.in"
- source "package/copas/Config.in"
- source "package/cosmo/Config.in"
- source "package/coxpcall/Config.in"
- source "package/dado/Config.in"
- source "package/lbase64/Config.in"
- source "package/ljlinenoise/Config.in"
- source "package/ljsyscall/Config.in"
- source "package/lpeg/Config.in"
- source "package/lpty/Config.in"
- source "package/lrandom/Config.in"
- source "package/lsqlite3/Config.in"
- source "package/lua-cjson/Config.in"
- source "package/lua-coat/Config.in"
- source "package/lua-coatpersistent/Config.in"
- source "package/lua-csnappy/Config.in"
- source "package/lua-ev/Config.in"
- source "package/lua-iconv/Config.in"
- source "package/lua-messagepack/Config.in"
- source "package/lua-msgpack-native/Config.in"
- source "package/lua-periphery/Config.in"
- source "package/lua-testmore/Config.in"
- source "package/luabitop/Config.in"
- source "package/luacrypto/Config.in"
- source "package/luaexpat/Config.in"
- source "package/luaexpatutils/Config.in"
- source "package/luafilesystem/Config.in"
- source "package/luajson/Config.in"
- source "package/lualogging/Config.in"
- source "package/luaposix/Config.in"
- source "package/luasec/Config.in"
- source "package/luasocket/Config.in"
- source "package/luasql-sqlite3/Config.in"
- source "package/lunit/Config.in"
- source "package/luv/Config.in"
- source "package/luvi/Config.in"
- source "package/lzlib/Config.in"
- source "package/orbit/Config.in"
- source "package/rings/Config.in"
- source "package/wsapi/Config.in"
- source "package/xavante/Config.in"
-endmenu
-endif
source "package/lutok/Config.in"
source "package/micropython/Config.in"
source "package/micropython-lib/Config.in"
new file mode 100644
@@ -0,0 +1,49 @@
+# This file is included both from lua and luajit
+
+if !BR2_STATIC_LIBS
+
+comment "Lua libraries/modules"
+
+source "package/cgilua/Config.in"
+source "package/copas/Config.in"
+source "package/cosmo/Config.in"
+source "package/coxpcall/Config.in"
+source "package/dado/Config.in"
+source "package/lbase64/Config.in"
+source "package/ljlinenoise/Config.in"
+source "package/ljsyscall/Config.in"
+source "package/lpeg/Config.in"
+source "package/lpty/Config.in"
+source "package/lrandom/Config.in"
+source "package/lsqlite3/Config.in"
+source "package/lua-cjson/Config.in"
+source "package/lua-coat/Config.in"
+source "package/lua-coatpersistent/Config.in"
+source "package/lua-csnappy/Config.in"
+source "package/lua-ev/Config.in"
+source "package/lua-iconv/Config.in"
+source "package/lua-messagepack/Config.in"
+source "package/lua-msgpack-native/Config.in"
+source "package/lua-periphery/Config.in"
+source "package/lua-testmore/Config.in"
+source "package/luabitop/Config.in"
+source "package/luacrypto/Config.in"
+source "package/luaexpat/Config.in"
+source "package/luaexpatutils/Config.in"
+source "package/luafilesystem/Config.in"
+source "package/luajson/Config.in"
+source "package/lualogging/Config.in"
+source "package/luaposix/Config.in"
+source "package/luasec/Config.in"
+source "package/luasocket/Config.in"
+source "package/luasql-sqlite3/Config.in"
+source "package/lunit/Config.in"
+source "package/luv/Config.in"
+source "package/luvi/Config.in"
+source "package/lzlib/Config.in"
+source "package/orbit/Config.in"
+source "package/rings/Config.in"
+source "package/wsapi/Config.in"
+source "package/xavante/Config.in"
+
+endif # !static
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_LUA
+menuconfig BR2_PACKAGE_LUA
bool "lua"
select BR2_PACKAGE_HAS_LUAINTERPRETER
help
@@ -68,4 +68,6 @@ config BR2_PACKAGE_LUA_LINENOISE
endchoice
+source "package/lua/Config.ext"
+
endif
new file mode 120000
@@ -0,0 +1 @@
+../lua/Config.ext
\ No newline at end of file
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
BR2_powerpc || BR2_arm || BR2_armeb || \
((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT)
-config BR2_PACKAGE_LUAJIT
+menuconfig BR2_PACKAGE_LUAJIT
bool "luajit"
select BR2_PACKAGE_HAS_LUAINTERPRETER
depends on !BR2_STATIC_LIBS # dlopen
@@ -32,6 +32,8 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
default "5.1"
+source "package/luajit/Config.ext"
+
endif
comment "luajit needs a toolchain w/ dynamic library"