From: Francois Perrad Date: Sat, 11 Jan 2014 15:42:08 +0000 (+0100) Subject: lua-cjson: restore official name X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a6c5347844a45a5f61260cf4e1d108c39fc6bf44;p=buildroot.git lua-cjson: restore official name (need by LuaRocks) Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN Reviewed-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- diff --git a/Config.in.legacy b/Config.in.legacy index 0526419387..754d9de52a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -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" diff --git a/package/Config.in b/package/Config.in index 39b0801f87..b47d7cba9e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -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" diff --git a/package/lua-cjson/Config.in b/package/lua-cjson/Config.in new file mode 100644 index 0000000000..8129fab4c3 --- /dev/null +++ b/package/lua-cjson/Config.in @@ -0,0 +1,14 @@ +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: + - Fast, standards compliant encoding/parsing routines + - Full support for JSON with UTF-8, including decoding surrogate pairs + - Optional run-time support for common exceptions to the JSON + specification (infinity, NaN, ...) + - No dependencies on other libraries + + (C-module) + + http://www.kyne.com.au/~mark/software/lua-cjson.php diff --git a/package/lua-cjson/lua-cjson.mk b/package/lua-cjson/lua-cjson.mk new file mode 100644 index 0000000000..92af23f1dc --- /dev/null +++ b/package/lua-cjson/lua-cjson.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# lua-cjson +# +################################################################################ + +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 LUA_CJSON_BUILD_CMDS + $(MAKE) -C $(@D) \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + CC="$(TARGET_CC)" \ + LD="$(TARGET_LD)" \ + PREFIX=$(STAGING_DIR)/usr +endef + +define LUA_CJSON_INSTALL_TARGET_CMDS + $(MAKE) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" -C $(@D) install +endef + +$(eval $(generic-package)) diff --git a/package/luacjson/Config.in b/package/luacjson/Config.in deleted file mode 100644 index d3665c0122..0000000000 --- a/package/luacjson/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -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 - - Full support for JSON with UTF-8, including decoding surrogate pairs - - Optional run-time support for common exceptions to the JSON - specification (infinity, NaN, ...) - - No dependencies on other libraries - - (C-module) - - http://www.kyne.com.au/~mark/software/lua-cjson.php diff --git a/package/luacjson/luacjson.mk b/package/luacjson/luacjson.mk deleted file mode 100644 index 86be87555b..0000000000 --- a/package/luacjson/luacjson.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# luacjson -# -################################################################################ - -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 - -define LUACJSON_BUILD_CMDS - $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - CC="$(TARGET_CC)" \ - LD="$(TARGET_LD)" \ - PREFIX=$(STAGING_DIR)/usr -endef - -define LUACJSON_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" -C $(@D) install -endef - -$(eval $(generic-package))