Commit a6c53478 authored by Francois Perrad's avatar Francois Perrad Committed by Peter Korsgaard
Browse files

lua-cjson: restore official name 



(need by LuaRocks)

Signed-off-by: default avatarFrancois Perrad <francois.perrad@gadz.org>
Signed-off-by: default avatarYann E. MORIN <yann.morin.1998@free.fr>
Reviewed-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 72afb294

Config.in.legacy

+7 −0
Original line number Diff line number Diff line
@@ -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"

package/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -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"

package/luacjson/Config.in→package/lua-cjson/Config.in

+2 −2
Original line number Diff line number Diff line 
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:

package/luacjson/luacjson.mk→package/lua-cjson/lua-cjson.mk

+8 −9
Original line number Diff line number Diff line 
################################################################################

#

# 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