lua: remove built dependencies
PATCH v3 1/3 lua: remove built dependencies
runtime dependencies are handled in Config.in
--- package/cgilua/Config.in | 1 + package/cgilua/cgilua.mk | 1 - package/copas/Config.in | 1 + package/copas/copas.mk | 1 - package/coxpcall/coxpcall.mk | 1 - package/wsapi/Config.in | 1 + package/wsapi/wsapi.mk | 1 - package/xavante/Config.in | 1 + package/xavante/xavante.mk | 1 - 9 files changed, 4 insertions(+), 5 deletions(-)
package/cgilua/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_CGILUA bool "cgilua" + # Runtime dependency only select BR2_PACKAGE_LUAFILESYSTEM help CGILua is a tool for creating dynamic HTML pages
package/cgilua/cgilua.mk +0 -1
@@ -6,7 +6,6 @@ CGILUA_VERSION = 5.1.4 CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua -CGILUA_DEPENDENCIES = luafilesystem CGILUA_LICENSE = MIT define CGILUA_INSTALL_TARGET_CMDS
package/copas/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_COPAS bool "copas" + # Runtime dependency only select BR2_PACKAGE_COXPCALL select BR2_PACKAGE_LUASOCKET help
package/copas/copas.mk +0 -1
@@ -6,7 +6,6 @@ COPAS_VERSION = 1.1.6 COPAS_SITE = http://github.com/downloads/keplerproject/copas -COPAS_DEPENDENCIES = lua coxpcall luasocket COPAS_LICENSE = MIT define COPAS_INSTALL_TARGET_CMDS
package/coxpcall/coxpcall.mk +0 -1
@@ -6,7 +6,6 @@ COXPCALL_VERSION = 1.13.0 COXPCALL_SITE = http://luaforge.net/frs/download.php/3406 -COXPCALL_DEPENDENCIES = lua COXPCALL_LICENSE = MIT define COXPCALL_INSTALL_TARGET_CMDS
package/wsapi/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_WSAPI bool "wsapi" + # Runtime dependency only select BR2_PACKAGE_COXPCALL select BR2_PACKAGE_LUAFILESYSTEM select BR2_PACKAGE_RINGS
package/wsapi/wsapi.mk +0 -1
@@ -6,7 +6,6 @@ WSAPI_VERSION = 1.5 WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi -WSAPI_DEPENDENCIES = coxpcall luafilesystem rings WSAPI_LICENSE = MIT define WSAPI_INSTALL_TARGET_CMDS
package/xavante/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_XAVANTE bool "xavante" + # Runtime dependency only select BR2_PACKAGE_CGILUA select BR2_PACKAGE_COPAS select BR2_PACKAGE_COXPCALL
package/xavante/xavante.mk +0 -1
@@ -6,7 +6,6 @@ XAVANTE_VERSION = 2.2.1 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante -XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi XAVANTE_LICENSE = MIT define XAVANTE_INSTALL_TARGET_CMDS
Signature · 1 line
1.7.9.5
PATCH v3 2/3 luainterpreter: create virtual package
luainterpreter is lua or luajit
--- package/Config.in | 1 + package/lua-msgpack-native/Config.in | 1 + package/lua-msgpack-native/lua-msgpack-native.mk | 2 +- package/lua/Config.in | 1 + package/luacjson/Config.in | 1 + package/luacjson/luacjson.mk | 2 +- package/luaexpat/Config.in | 1 + package/luaexpat/luaexpat.mk | 2 +- package/luafilesystem/Config.in | 1 + package/luafilesystem/luafilesystem.mk | 2 +- package/luainterpreter/Config.in | 2 ++ package/luainterpreter/luainterpreter.mk | 17 +++++++++++++++++ package/luajit/Config.in | 1 + package/luasocket/Config.in | 1 + package/luasocket/luasocket.mk | 2 +- package/rings/Config.in | 1 + package/rings/rings.mk | 2 +- 17 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 package/luainterpreter/Config.in create mode 100644 package/luainterpreter/luainterpreter.mk
package/Config.in +1 -0
@@ -292,6 +292,7 @@ source "package/haserl/Config.in" source "package/jamvm/Config.in" source "package/lua/Config.in" source "package/luajit/Config.in" +source "package/luainterpreter/Config.in" if BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT menu "LUA libraries/modules" source "package/cgilua/Config.in"
package/lua-msgpack-native/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_LUA_MSGPACK_NATIVE bool "lua-msgpack-native" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER help This is a native, C language implementation of msgpack (http://msgpack.org) library/protocol for Lua language
package/lua-msgpack-native/lua-msgpack-native.mk +1 -1
@@ -5,7 +5,7 @@ ############################################################# LUA_MSGPACK_NATIVE_VERSION = g41cce91 LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/master -LUA_MSGPACK_NATIVE_DEPENDENCIES = lua +LUA_MSGPACK_NATIVE_DEPENDENCIES = luainterpreter LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0 LUA_MSGPACK_NATIVE_LICENSE_FILES = LICENSE.txt
package/lua/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_LUA bool "lua" + select BR2_PACKAGE_HAS_LUA_INTERPRETER help Lua is a powerful, fast, light-weight, embeddable scripting language.
package/luacjson/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_LUACJSON bool "luacjson" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER help The Lua CJSON module provides JSON support for Lua. It features: - Fast, standards compliant encoding/parsing routines
package/luacjson/luacjson.mk +1 -1
@@ -6,7 +6,7 @@ LUACJSON_VERSION = 2.1.0 LUACJSON_SOURCE = lua-cjson-$(LUACJSON_VERSION).tar.gz LUACJSON_SITE = http://www.kyne.com.au/~mark/software/download -LUACJSON_DEPENDENCIES = lua +LUACJSON_DEPENDENCIES = luainterpreter LUACJSON_LICENSE = MIT LUACJSON_LICENSE_FILES = LICENSE
package/luaexpat/Config.in +1 -0
@@ -1,6 +1,7 @@ config BR2_PACKAGE_LUAEXPAT bool "luaexpat" select BR2_PACKAGE_EXPAT + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER help LuaExpat is a SAX XML parser based on the Expat library.
package/luaexpat/luaexpat.mk +1 -1
@@ -6,7 +6,7 @@ LUAEXPAT_VERSION = 1.2.0 LUAEXPAT_SITE = http://matthewwild.co.uk/projects/luaexpat -LUAEXPAT_DEPENDENCIES = lua expat +LUAEXPAT_DEPENDENCIES = luainterpreter expat LUAEXPAT_LICENSE = MIT
package/luafilesystem/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_LUAFILESYSTEM bool "luafilesystem" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER help LuaFileSystem offers a portable way to access the underlying directory structure and file attributes.
package/luafilesystem/luafilesystem.mk +1 -1
@@ -6,7 +6,7 @@ LUAFILESYSTEM_VERSION = 1.5.0 LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem -LUAFILESYSTEM_DEPENDENCIES = lua +LUAFILESYSTEM_DEPENDENCIES = luainterpreter LUAFILESYSTEM_LICENSE = MIT ifeq ($(BR2_LARGEFILE),y)
package/luainterpreter/Config.in new file +2 -0
@@ -0,0 +1,2 @@ +config BR2_PACKAGE_HAS_LUA_INTERPRETER + bool
package/luainterpreter/luainterpreter.mk new file +17 -0
@@ -0,0 +1,17 @@ +############################################################# +# +# Virtual package for luainterpreter +# +############################################################# + +LUAINTERPRETER_SOURCE = + +ifeq ($(BR2_PACKAGE_LUA),y) +LUAINTERPRETER_DEPENDENCIES = lua +endif + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +LUAINTERPRETER_DEPENDENCIES = luajit +endif + +$(eval $(generic-package))
package/luajit/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_LUAJIT bool "luajit" + select BR2_PACKAGE_HAS_LUA_INTERPRETER # Luajit is only available for some target architectures, and # has some complexity wrt 32/64. See luajit.mk for details. depends on BR2_i386 || (BR2_x86_64 && BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb
package/luasocket/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_LUASOCKET bool "luasocket" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER help LuaSocket is the most comprehensive networking support library for the Lua language.
package/luasocket/luasocket.mk +1 -1
@@ -6,7 +6,7 @@ LUASOCKET_VERSION = 2.0.2 LUASOCKET_SITE = http://luaforge.net/frs/download.php/2664 -LUASOCKET_DEPENDENCIES = lua +LUASOCKET_DEPENDENCIES = luainterpreter LUASOCKET_LICENSE = MIT LUASOCKET_LICENSE_FILES = LICENSE
package/rings/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_RINGS bool "rings" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER help Provides a way to create new Lua states from within Lua.
package/rings/rings.mk +1 -1
@@ -6,7 +6,7 @@ RINGS_VERSION = 1.2.3 RINGS_SITE = http://github.com/downloads/keplerproject/rings -RINGS_DEPENDENCIES = lua +RINGS_DEPENDENCIES = luainterpreter RINGS_LICENSE = MIT define RINGS_BUILD_CMDS
Signature · 1 line
1.7.9.5
PATCH v3 3/3 luajit: allow to build Lua extensions without lua
In reply to Francois Perrad--- package/luajit/luajit-05-install-inc.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 package/luajit/luajit-05-install-inc.patch
package/luajit/luajit-05-install-inc.patch new file +17 -0
@@ -0,0 +1,17 @@ +Install includes like lua's ones + +Signed-off-by: Francois Perrad <[email protected]> + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -31,7 +31,7 @@ DPREFIX= $(DESTDIR)$(PREFIX) + INSTALL_BIN= $(DPREFIX)/bin + INSTALL_LIB= $(DPREFIX)/lib + INSTALL_SHARE= $(DPREFIX)/share +-INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) ++INSTALL_INC= $(DPREFIX)/include + + INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) + INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
Signature · 1 line
1.7.9.5
PATCH v3 1/3 lua: remove built dependencies
In reply to Francois Perradping
2013/3/7 Francois Perrad <[email protected]>:
Quoted 122 lines
runtime dependencies are handled in Config.in
Signed-off-by Francois Perrad <[email protected]>--- package/cgilua/Config.in | 1 + package/cgilua/cgilua.mk | 1 - package/copas/Config.in | 1 + package/copas/copas.mk | 1 - package/coxpcall/coxpcall.mk | 1 - package/wsapi/Config.in | 1 + package/wsapi/wsapi.mk | 1 - package/xavante/Config.in | 1 + package/xavante/xavante.mk | 1 - 9 files changed, 4 insertions(+), 5 deletions(-)package/cgilua/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_CGILUA bool "cgilua" + # Runtime dependency only select BR2_PACKAGE_LUAFILESYSTEM help CGILua is a tool for creating dynamic HTML pagespackage/cgilua/cgilua.mk +0
-1@@ -6,7 +6,6 @@ CGILUA_VERSION = 5.1.4 CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua -CGILUA_DEPENDENCIES = luafilesystem CGILUA_LICENSE = MIT define CGILUA_INSTALL_TARGET_CMDSpackage/copas/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_COPAS bool "copas" + # Runtime dependency only select BR2_PACKAGE_COXPCALL select BR2_PACKAGE_LUASOCKET helppackage/copas/copas.mk +0
-1@@ -6,7 +6,6 @@ COPAS_VERSION = 1.1.6 COPAS_SITE = http://github.com/downloads/keplerproject/copas -COPAS_DEPENDENCIES = lua coxpcall luasocket COPAS_LICENSE = MIT define COPAS_INSTALL_TARGET_CMDSpackage/coxpcall/coxpcall.mk +0
-1@@ -6,7 +6,6 @@ COXPCALL_VERSION = 1.13.0 COXPCALL_SITE = http://luaforge.net/frs/download.php/3406 -COXPCALL_DEPENDENCIES = lua COXPCALL_LICENSE = MIT define COXPCALL_INSTALL_TARGET_CMDSpackage/wsapi/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_WSAPI bool "wsapi" + # Runtime dependency only select BR2_PACKAGE_COXPCALL select BR2_PACKAGE_LUAFILESYSTEM select BR2_PACKAGE_RINGSpackage/wsapi/wsapi.mk +0
-1@@ -6,7 +6,6 @@ WSAPI_VERSION = 1.5 WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi -WSAPI_DEPENDENCIES = coxpcall luafilesystem rings WSAPI_LICENSE = MIT define WSAPI_INSTALL_TARGET_CMDSpackage/xavante/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_XAVANTE bool "xavante" + # Runtime dependency only select BR2_PACKAGE_CGILUA select BR2_PACKAGE_COPAS select BR2_PACKAGE_COXPCALLpackage/xavante/xavante.mk +0
-2@@ -6,7 +6,6 @@ XAVANTE_VERSION = 2.2.1 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante -XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi XAVANTE_LICENSE = MIT define XAVANTE_INSTALL_TARGET_CMDS --1.7.9.5
PATCH v3 1/3 lua: remove built dependencies
In reply to Francois Perrad2013/3/7 Francois Perrad <[email protected]>:
Quoted 120 lines
runtime dependencies are handled in Config.in
Signed-off-by Francois Perrad <[email protected]>--- package/cgilua/Config.in | 1 + package/cgilua/cgilua.mk | 1 - package/copas/Config.in | 1 + package/copas/copas.mk | 1 - package/coxpcall/coxpcall.mk | 1 - package/wsapi/Config.in | 1 + package/wsapi/wsapi.mk | 1 - package/xavante/Config.in | 1 + package/xavante/xavante.mk | 1 - 9 files changed, 4 insertions(+), 5 deletions(-)package/cgilua/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_CGILUA bool "cgilua" + # Runtime dependency only select BR2_PACKAGE_LUAFILESYSTEM help CGILua is a tool for creating dynamic HTML pagespackage/cgilua/cgilua.mk +0
-1@@ -6,7 +6,6 @@ CGILUA_VERSION = 5.1.4 CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua -CGILUA_DEPENDENCIES = luafilesystem CGILUA_LICENSE = MIT define CGILUA_INSTALL_TARGET_CMDSpackage/copas/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_COPAS bool "copas" + # Runtime dependency only select BR2_PACKAGE_COXPCALL select BR2_PACKAGE_LUASOCKET helppackage/copas/copas.mk +0
-1@@ -6,7 +6,6 @@ COPAS_VERSION = 1.1.6 COPAS_SITE = http://github.com/downloads/keplerproject/copas -COPAS_DEPENDENCIES = lua coxpcall luasocket COPAS_LICENSE = MIT define COPAS_INSTALL_TARGET_CMDSpackage/coxpcall/coxpcall.mk +0
-1@@ -6,7 +6,6 @@ COXPCALL_VERSION = 1.13.0 COXPCALL_SITE = http://luaforge.net/frs/download.php/3406 -COXPCALL_DEPENDENCIES = lua COXPCALL_LICENSE = MIT define COXPCALL_INSTALL_TARGET_CMDSpackage/wsapi/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_WSAPI bool "wsapi" + # Runtime dependency only select BR2_PACKAGE_COXPCALL select BR2_PACKAGE_LUAFILESYSTEM select BR2_PACKAGE_RINGSpackage/wsapi/wsapi.mk +0
-1@@ -6,7 +6,6 @@ WSAPI_VERSION = 1.5 WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi -WSAPI_DEPENDENCIES = coxpcall luafilesystem rings WSAPI_LICENSE = MIT define WSAPI_INSTALL_TARGET_CMDSpackage/xavante/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_XAVANTE bool "xavante" + # Runtime dependency only select BR2_PACKAGE_CGILUA select BR2_PACKAGE_COPAS select BR2_PACKAGE_COXPCALLpackage/xavante/xavante.mk +0
-2@@ -6,7 +6,6 @@ XAVANTE_VERSION = 2.2.1 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante -XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi XAVANTE_LICENSE = MIT define XAVANTE_INSTALL_TARGET_CMDS --
Quoted 2 lines
1.7.9.5
ping
PATCH v3 1/3 lua: remove built dependencies
2013/4/15 Fran?ois Perrad <[email protected]>:
Quoted 119 lines
2013/3/7 Francois Perrad <[email protected]>:
Quoted 118 lines
runtime dependencies are handled in Config.in
Signed-off-by Francois Perrad <[email protected]>--- package/cgilua/Config.in | 1 + package/cgilua/cgilua.mk | 1 - package/copas/Config.in | 1 + package/copas/copas.mk | 1 - package/coxpcall/coxpcall.mk | 1 - package/wsapi/Config.in | 1 + package/wsapi/wsapi.mk | 1 - package/xavante/Config.in | 1 + package/xavante/xavante.mk | 1 - 9 files changed, 4 insertions(+), 5 deletions(-)package/cgilua/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_CGILUA bool "cgilua" + # Runtime dependency only select BR2_PACKAGE_LUAFILESYSTEM help CGILua is a tool for creating dynamic HTML pagespackage/cgilua/cgilua.mk +0
-1@@ -6,7 +6,6 @@ CGILUA_VERSION = 5.1.4 CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua -CGILUA_DEPENDENCIES = luafilesystem CGILUA_LICENSE = MIT define CGILUA_INSTALL_TARGET_CMDSpackage/copas/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_COPAS bool "copas" + # Runtime dependency only select BR2_PACKAGE_COXPCALL select BR2_PACKAGE_LUASOCKET helppackage/copas/copas.mk +0
-1@@ -6,7 +6,6 @@ COPAS_VERSION = 1.1.6 COPAS_SITE = http://github.com/downloads/keplerproject/copas -COPAS_DEPENDENCIES = lua coxpcall luasocket COPAS_LICENSE = MIT define COPAS_INSTALL_TARGET_CMDSpackage/coxpcall/coxpcall.mk +0
-1@@ -6,7 +6,6 @@ COXPCALL_VERSION = 1.13.0 COXPCALL_SITE = http://luaforge.net/frs/download.php/3406 -COXPCALL_DEPENDENCIES = lua COXPCALL_LICENSE = MIT define COXPCALL_INSTALL_TARGET_CMDSpackage/wsapi/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_WSAPI bool "wsapi" + # Runtime dependency only select BR2_PACKAGE_COXPCALL select BR2_PACKAGE_LUAFILESYSTEM select BR2_PACKAGE_RINGSpackage/wsapi/wsapi.mk +0
-1@@ -6,7 +6,6 @@ WSAPI_VERSION = 1.5 WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi -WSAPI_DEPENDENCIES = coxpcall luafilesystem rings WSAPI_LICENSE = MIT define WSAPI_INSTALL_TARGET_CMDSpackage/xavante/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_XAVANTE bool "xavante" + # Runtime dependency only select BR2_PACKAGE_CGILUA select BR2_PACKAGE_COPAS select BR2_PACKAGE_COXPCALLpackage/xavante/xavante.mk +0
-1@@ -6,7 +6,6 @@ XAVANTE_VERSION = 2.2.1 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante -XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi XAVANTE_LICENSE = MIT
Quoted 6 lines
Quoted 4 lines
package/xavante/xavante.mk +0
-1define XAVANTE_INSTALL_TARGET_CMDS --1.7.9.5
ping
ping
Thomas Petazzoni
AppliedPATCH v3 1/3 lua: remove built dependencies
In reply to Francois PerradDear Francois Perrad,
Quoted 14 lines · Francois Perrad
runtime dependencies are handled in Config.in
Signed-off-by Francois Perrad <[email protected]>--- package/cgilua/Config.in | 1 + package/cgilua/cgilua.mk | 1 - package/copas/Config.in | 1 + package/copas/copas.mk | 1 - package/coxpcall/coxpcall.mk | 1 - package/wsapi/Config.in | 1 + package/wsapi/wsapi.mk | 1 - package/xavante/Config.in | 1 + package/xavante/xavante.mk | 1 - 9 files changed, 4 insertions(+), 5 deletions(-)
Applied to next, thanks.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com