gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lua-modules: choice between Lua 5.1.x & Lua 5.2.x 

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Francois Perrad 2014-01-17 18:47:36 +01:00 committed by Peter Korsgaard
parent ba296ab1ea
commit 751d85a7f8
11 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/lbase64/Config.in
View File

@ -1,7 +1,11 @@
config BR2_PACKAGE_LBASE64 config BR2_PACKAGE_LBASE64
bool "lbase64" bool "lbase64"
depends on BR2_PACKAGE_HAS_LUA_INTERPRETER depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
depends on !BR2_PACKAGE_LUA_5_2
help help
A base64 library for Lua A base64 library for Lua
http://luaforge.net/projects/lbase64/ http://luaforge.net/projects/lbase64/
comment "lbase64 needs a Lua 5.1 interpreter"
depends on BR2_PACKAGE_LUA_5_2

2
package/lua-ev/lua-ev.mk
View File

@ -9,6 +9,6 @@ LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION))
LUA_EV_DEPENDENCIES = luainterpreter libev LUA_EV_DEPENDENCIES = luainterpreter libev
LUA_EV_LICENSE = MIT LUA_EV_LICENSE = MIT
LUA_EV_LICENSE_FILES = README LUA_EV_LICENSE_FILES = README
LUA_EV_CONF_OPT = -DINSTALL_CMOD="/usr/lib/lua/5.1" LUA_EV_CONF_OPT = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)"
$(eval $(cmake-package)) $(eval $(cmake-package))

4
package/lua-msgpack-native/Config.in
View File

@ -1,8 +1,12 @@
config BR2_PACKAGE_LUA_MSGPACK_NATIVE config BR2_PACKAGE_LUA_MSGPACK_NATIVE
bool "lua-msgpack-native" bool "lua-msgpack-native"
depends on BR2_PACKAGE_HAS_LUA_INTERPRETER depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
depends on !BR2_PACKAGE_LUA_5_2
help help
This is a native, C language implementation of msgpack This is a native, C language implementation of msgpack
(http://msgpack.org) library/protocol for Lua language (http://msgpack.org) library/protocol for Lua language
https://github.com/kengonakajima/lua-msgpack-native https://github.com/kengonakajima/lua-msgpack-native
comment "lua-msgpack-native needs a Lua 5.1 interpreter"
depends on BR2_PACKAGE_LUA_5_2

3
package/lua-msgpack-native/lua-msgpack-native.mk
View File

@ -15,7 +15,8 @@ define LUA_MSGPACK_NATIVE_BUILD_CMDS
endef endef
define LUA_MSGPACK_NATIVE_INSTALL_TARGET_CMDS define LUA_MSGPACK_NATIVE_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -D $(@D)/msgpack.so $(TARGET_DIR)/usr/lib/lua/5.1/msgpack.so $(INSTALL) -m 755 -D $(@D)/msgpack.so \
$(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)/msgpack.so
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

4
package/luaexpat/Config.in
View File

@ -2,7 +2,11 @@ config BR2_PACKAGE_LUAEXPAT
bool "luaexpat" bool "luaexpat"
select BR2_PACKAGE_EXPAT select BR2_PACKAGE_EXPAT
depends on BR2_PACKAGE_HAS_LUA_INTERPRETER depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
depends on !BR2_PACKAGE_LUA_5_2
help help
LuaExpat is a SAX XML parser based on the Expat library. LuaExpat is a SAX XML parser based on the Expat library.
http://matthewwild.co.uk/projects/luaexpat/ http://matthewwild.co.uk/projects/luaexpat/
comment "luaexpat needs a Lua 5.1 interpreter"
depends on BR2_PACKAGE_LUA_5_2

4
package/luaexpatutils/Config.in
View File

@ -1,8 +1,12 @@
config BR2_PACKAGE_LUAEXPATUTILS config BR2_PACKAGE_LUAEXPATUTILS
bool "luaexpatutils" bool "luaexpatutils"
select BR2_PACKAGE_LUAEXPAT select BR2_PACKAGE_LUAEXPAT
depends on !BR2_PACKAGE_LUA_5_2
help help
lxp.doc is a module that provides useful features for working with lxp.doc is a module that provides useful features for working with
XML formats in LOM format as used by the LuaExpat project from Kepler. XML formats in LOM format as used by the LuaExpat project from Kepler.
https://github.com/stevedonovan/LuaExpatUtils https://github.com/stevedonovan/LuaExpatUtils
comment "luaexpatutils needs a Lua 5.1 interpreter"
depends on BR2_PACKAGE_LUA_5_2

2
package/luaexpatutils/luaexpatutils.mk
View File

@ -11,7 +11,7 @@ LUAEXPATUTILS_DEPENDENCIES = luaexpat
define LUAEXPATUTILS_INSTALL_TARGET_CMDS define LUAEXPATUTILS_INSTALL_TARGET_CMDS
$(INSTALL) -m 0644 -D $(@D)/lua/doc.lua \ $(INSTALL) -m 0644 -D $(@D)/lua/doc.lua \
$(TARGET_DIR)/usr/share/lua/5.1/lxp/doc.lua $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/lxp/doc.lua
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

2
package/luaposix/Config.in
View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_LUAPOSIX config BR2_PACKAGE_LUAPOSIX
bool "luaposix" bool "luaposix"
depends on BR2_PACKAGE_HAS_LUA_INTERPRETER depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
# LuaBitOp is already included in LuaJIT # LuaBitOp is already included in LuaJIT
help help
luaposix is a POSIX binding, including curses, for Lua 5.1 luaposix is a POSIX binding, including curses, for Lua 5.1

2
package/luaposix/luaposix.mk
View File

@ -10,7 +10,7 @@ LUAPOSIX_SOURCE = release-v$(LUAPOSIX_VERSION).tar.gz
LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE = MIT
LUAPOSIX_LICENSE_FILES = COPYING LUAPOSIX_LICENSE_FILES = COPYING
LUAPOSIX_DEPENDENCIES = luainterpreter host-lua LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua/5.1" --datarootdir="/usr/share/lua/5.1" LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
ifeq ($(BR2_PACKAGE_NCURSES),y) ifeq ($(BR2_PACKAGE_NCURSES),y)
LUAPOSIX_DEPENDENCIES += ncurses LUAPOSIX_DEPENDENCIES += ncurses

4
package/luarocks/luarocks.mk
View File

@ -12,7 +12,7 @@ LUAROCKS_LICENSE_FILES = COPYING
HOST_LUAROCKS_DEPENDENCIES = host-lua luainterpreter HOST_LUAROCKS_DEPENDENCIES = host-lua luainterpreter
LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks
LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-5.1.lua LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
define HOST_LUAROCKS_CONFIGURE_CMDS define HOST_LUAROCKS_CONFIGURE_CMDS
cd $(@D) && ./configure \ cd $(@D) && ./configure \
@ -41,5 +41,5 @@ endef
$(eval $(host-generic-package)) $(eval $(host-generic-package))
LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/5.1/?.lua" \ LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \
$(HOST_DIR)/usr/bin/lua $(HOST_DIR)/usr/bin/luarocks $(HOST_DIR)/usr/bin/lua $(HOST_DIR)/usr/bin/luarocks

4
package/luasec/Config.in
View File

@ -3,8 +3,12 @@ config BR2_PACKAGE_LUASEC
select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_LUASOCKET select BR2_PACKAGE_LUASOCKET
depends on BR2_PACKAGE_HAS_LUA_INTERPRETER depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
depends on !BR2_PACKAGE_LUA_5_2
help help
LuaSec is a binding for OpenSSL library to provide TLS/SSL LuaSec is a binding for OpenSSL library to provide TLS/SSL
communication. communication.
http://www.inf.puc-rio.br/~brunoos/luasec/ http://www.inf.puc-rio.br/~brunoos/luasec/
comment "luasec needs a Lua 5.1 interpreter"
depends on BR2_PACKAGE_LUA_5_2