Merge pull request #7487 from neheb/lsql

luasql: Update to 2.4.0

lang/luasql/Makefile

@@ -8,21 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luasql
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.4.0
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=b6251065656bf3e066d90d492dd06eec2c2cc76ab4b94187ce3ed9620d41f741
+PKG_SOURCE_URL:=https://codeload.github.com/keplerproject/luasql/tar.gz/v$(PKG_VERSION)?
-PKG_SOURCE_PROTO:=git
+PKG_HASH:=db2458a8c8c5f3bc717e4030fe2878f1ad8d71e437ec6149c381eebad5d525c5
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://github.com/keplerproject/luasql.git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 
+PKG_MAINTAINER:=
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=docs/us/license.html
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,7 +27,7 @@ define Package/luasql/Default
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Lua SQL binding
-  URL:=http://keplerproject.github.io/luasql/
+  URL:=https://keplerproject.github.io/luasql/
   DEPENDS:= +lua
 endef
 
@@ -99,11 +95,10 @@ ifeq ($(BUILD_VARIANT),sqlite3)
 endif
 
 MAKE_FLAGS += \
-	T="$(BUILD_VARIANT)" \
 	DRIVER_INCS="$(TARGET_CPPFLAGS)" \
 	DRIVER_LIBS="$(TARGET_LDFLAGS)" \
 	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-	lib
+	$(BUILD_VARIANT)
 
 define Package/Install/Default
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luasql

lang/luasql/patches/01-mariadb-compat.patch

@@ -1,20 +0,0 @@
-commit 6df3f672313f8dbca219199c8ec8d20c0247347f
-Author: Tomás Guisasola <tomasguisasola@gmail.com>
-Date:   Mon Jul 31 09:41:49 2017 -0300
-
-    Add support for building with MariaDB (thanks to Florian Weimer).
-
---- a/src/ls_mysql.c
-+++ b/src/ls_mysql.c
-@@ -602,7 +602,11 @@ LUASQL_API int luaopen_luasql_mysql (lua
- 	luaL_setfuncs(L, driver, 0);
- 	luasql_set_info (L);
-     lua_pushliteral (L, "_MYSQLVERSION");
-+#ifdef MARIADB_CLIENT_VERSION_STR
-+    lua_pushliteral (L, MARIADB_CLIENT_VERSION_STR);
-+#else
-     lua_pushliteral (L, MYSQL_SERVER_VERSION);
-+#endif
-     lua_settable (L, -3);
- 	return 1;
- }