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

lua-cjson: restore official name 

(need by LuaRocks)

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Francois Perrad 2014-01-11 16:42:08 +01:00 committed by Peter Korsgaard
parent 72afb294ff
commit a6c5347844
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Config.in.legacy
View File

@ -146,6 +146,13 @@ config BR2_PACKAGE_NETKITTELNET
been deprecated since 2012.11. 'busybox' provides a telnet
client and should be used instead.
config BR2_PACKAGE_LUACJSON
bool "luacjson has been replaced by lua-cjson"
select BR2_PACKAGE_LUA_CJSON
select BR2_LEGACY
help
The option has been renamed BR2_PACKAGE_LUA_CJSON.
###############################################################################
comment "Legacy options removed in 2013.11"

2
package/Config.in
View File

@ -368,10 +368,10 @@ source "package/cgilua/Config.in"
source "package/copas/Config.in"
source "package/coxpcall/Config.in"
source "package/lbase64/Config.in"
source "package/lua-cjson/Config.in"
source "package/lua-ev/Config.in"
source "package/lua-msgpack-native/Config.in"
source "package/luabitop/Config.in"
source "package/luacjson/Config.in"
source "package/luacrypto/Config.in"
source "package/luaexpat/Config.in"
source "package/luaexpatutils/Config.in"

4
package/luacjson/Config.in → package/lua-cjson/Config.in
View File

@ -1,5 +1,5 @@
config BR2_PACKAGE_LUACJSON
bool "luacjson"
config BR2_PACKAGE_LUA_CJSON
bool "lua-cjson"
depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
help
The Lua CJSON module provides JSON support for Lua. It features:

17
package/luacjson/luacjson.mk → package/lua-cjson/lua-cjson.mk
View File

@ -1,17 +1,16 @@
################################################################################
#
# luacjson
# lua-cjson
#
################################################################################
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 = luainterpreter
LUACJSON_LICENSE = MIT
LUACJSON_LICENSE_FILES = LICENSE
LUA_CJSON_VERSION = 2.1.0
LUA_CJSON_SITE = http://www.kyne.com.au/~mark/software/download
LUA_CJSON_DEPENDENCIES = luainterpreter
LUA_CJSON_LICENSE = MIT
LUA_CJSON_LICENSE_FILES = LICENSE
define LUACJSON_BUILD_CMDS
define LUA_CJSON_BUILD_CMDS
$(MAKE) -C $(@D) \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
@ -20,7 +19,7 @@ define LUACJSON_BUILD_CMDS
PREFIX=$(STAGING_DIR)/usr
endef
define LUACJSON_INSTALL_TARGET_CMDS
define LUA_CJSON_INSTALL_TARGET_CMDS
$(MAKE) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" -C $(@D) install
endef