From: Francois Perrad Date: Sat, 11 Jan 2014 15:42:09 +0000 (+0100) Subject: luasql-sqlite3: renamed like with LuaRocks X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=63058f8b0224298d6f0e8cd50462ad258dab7072;p=buildroot.git luasql-sqlite3: renamed like with LuaRocks Signed-off-by: Francois Perrad [yann.morin.1998@free.fr: select BR2_PACKAGE_SQLITE] Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- diff --git a/Config.in.legacy b/Config.in.legacy index 754d9de52a..597534ebf6 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_LUASQL + bool "luasql has been replaced by luasql-sqlite3" + select BR2_PACKAGE_LUASQL_SQLITE3 + select BR2_LEGACY + help + The option has been renamed BR2_PACKAGE_LUASQL_SQLITE3. + config BR2_PACKAGE_LUACJSON bool "luacjson has been replaced by lua-cjson" select BR2_PACKAGE_LUA_CJSON diff --git a/package/Config.in b/package/Config.in index b47d7cba9e..78c0e066f5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -371,6 +371,7 @@ 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/luasql-sqlite3/Config.in" source "package/luabitop/Config.in" source "package/luacrypto/Config.in" source "package/luaexpat/Config.in" @@ -379,7 +380,6 @@ source "package/luafilesystem/Config.in" source "package/luaposix/Config.in" source "package/luasec/Config.in" source "package/luasocket/Config.in" -source "package/luasql/Config.in" source "package/orbit/Config.in" source "package/rings/Config.in" source "package/wsapi/Config.in" diff --git a/package/luasql-sqlite3/Config.in b/package/luasql-sqlite3/Config.in new file mode 100644 index 0000000000..fca6582bdf --- /dev/null +++ b/package/luasql-sqlite3/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LUASQL_SQLITE3 + bool "luasql-sqlite3" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + select BR2_PACKAGE_SQLITE + help + LuaSQL is a simple interface from Lua to a DBMS. + + http://www.keplerproject.org/luasql + diff --git a/package/luasql-sqlite3/luasql-sqlite3.mk b/package/luasql-sqlite3/luasql-sqlite3.mk new file mode 100644 index 0000000000..b114f0237b --- /dev/null +++ b/package/luasql-sqlite3/luasql-sqlite3.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# luasql-sqlite3 +# +################################################################################ + +LUASQL_SQLITE3_VERSION = v2.3.0 +LUASQL_SQLITE3_SITE = https://github.com/keplerproject/luasql/tarball/$(LUASQL_SQLITE3_VERSION) +LUASQL_SQLITE3_LICENSE = MIT +LUASQL_SQLITE3_LICENSE_FILES = README +LUASQL_SQLITE3_DEPENDENCIES = luainterpreter sqlite + +LUASQL_SQLITE3_MAKE_FLAGS = \ + CC="$(TARGET_CC)" \ + LD="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS) -fPIC" \ + T="sqlite3" \ + DRIVER_LIBS="-L$(STAGING_DIR)/usr/lib -lsqlite3" + +define LUASQL_SQLITE3_BUILD_CMDS + $(MAKE) -C $(@D) $(LUASQL_SQLITE3_MAKE_FLAGS) +endef + +define LUASQL_SQLITE3_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) $(LUASQL_SQLITE3_MAKE_FLAGS) \ + PREFIX="$(TARGET_DIR)/usr" install +endef + +define LUASQL_SQLITE3_UNINSTALL_TARGET_CMDS + rm -rf $(TARGET_DIR)/usr/lib/lua/5.1/luasql +endef + +$(eval $(generic-package)) diff --git a/package/luasql/Config.in b/package/luasql/Config.in deleted file mode 100644 index 96e04fb823..0000000000 --- a/package/luasql/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_LUASQL - bool "luasql" - depends on BR2_PACKAGE_HAS_LUA_INTERPRETER - help - LuaSQL is a simple interface from Lua to a DBMS. - - http://www.keplerproject.org/luasql - -if BR2_PACKAGE_LUASQL -choice - prompt "LuaSQL Driver" - help - Select backend driver for LuaSQL. - -config BR2_PACKAGE_LUASQL_DRIVER_SQLITE3 - bool "SQLite3" - select BR2_PACKAGE_SQLITE - help - Select if you wish to use the SQLite3 LuaSQL driver. - -endchoice -endif diff --git a/package/luasql/luasql.mk b/package/luasql/luasql.mk deleted file mode 100644 index a1447cc22b..0000000000 --- a/package/luasql/luasql.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# luasql -# -################################################################################ - -LUASQL_VERSION = v2.3.0 -LUASQL_SITE = $(call github,keplerproject,luasql,$(LUASQL_VERSION)) -LUASQL_LICENSE = MIT -LUASQL_LICENSE_FILES = README -LUASQL_DEPENDENCIES = luainterpreter - -LUASQL_MAKE_FLAGS = \ - CC="$(TARGET_CC)" \ - LD="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS) -fPIC" - -ifeq ($(BR2_PACKAGE_LUASQL_DRIVER_SQLITE3),y) -LUASQL_DEPENDENCIES += sqlite -LUASQL_MAKE_FLAGS += \ - T="sqlite3" \ - DRIVER_LIBS="-L$(STAGING_DIR)/usr/lib -lsqlite3" -endif - -define LUASQL_BUILD_CMDS - $(MAKE) -C $(@D) $(LUASQL_MAKE_FLAGS) -endef - -define LUASQL_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) $(LUASQL_MAKE_FLAGS) \ - PREFIX="$(TARGET_DIR)/usr" install -endef - -$(eval $(generic-package))