From fdf7cdb28365b8ccc2afd8ca678e776f0ec0e9e2 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Tue, 14 Aug 2018 13:43:35 +0000 Subject: [PATCH] lua-lsqlite3: update to 0.9.5 Changes in the package * ability to pass flags to the open() calls * multithreading helpers Full log at http://lua.sqlite.org/index.cgi/artifact/cc0df52dfc332ae0 Changes in packaging * actually use PKG_BUILD_DIR * Work with current upstream sources. (current release only builds because it's archived on openwrt servers) * don't link against liblua, this is an anti-pattern * properly specify the LSQLITE version instead of overriding the SQLITE version. Signed-off-by: Karl Palsson --- lang/lua-lsqlite3/Makefile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/lang/lua-lsqlite3/Makefile b/lang/lua-lsqlite3/Makefile index 02f4069e2..64d5d0634 100644 --- a/lang/lua-lsqlite3/Makefile +++ b/lang/lua-lsqlite3/Makefile @@ -8,18 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lsqlite3 -PKG_VERSION:=0.9.3 +PKG_VERSION:=0.9.5 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=http://lua.sqlite.org/index.cgi/zip/lsqlite3_fsl09w.zip -PKG_HASH:=b857df8b66d01a803378cc86e56b787958beffdc8b851ad304f4ce8c7f0e9dbb +PKG_SOURCE:=lsqlite3_fsl09y.zip +PKG_SOURCE_URL:=http://lua.sqlite.org/index.cgi/zip/ +PKG_HASH:=d38402aa7640055d260c1246c36e6d6d31b425a25a805431f13695694466b722 PKG_LICENSE:=MIT PKG_MAINTAINER:=Oskari Rauta -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)_fsl09w.zip +PKG_BUILD_DIR:=$(BUILD_DIR)/$(basename $(PKG_SOURCE)) include $(INCLUDE_DIR)/package.mk @@ -38,21 +37,21 @@ endef TARGET_CFLAGS += $(FPIC) -std=gnu99 TARGET_CPPFLAGS += -DLUA_USE_LINUX -TARGET_LDFLAGS += -llua -lsqlite3 -lpthread +TARGET_LDFLAGS += -lsqlite3 -lpthread define Build/Compile $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \ - -c $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/lsqlite3.c \ - -o $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/lsqlite3.o \ - -DSQLITE_VERSION="$(PKG_VERSION)" + -c $(PKG_BUILD_DIR)/lsqlite3.c \ + -o $(PKG_BUILD_DIR)/lsqlite3.o \ + -DLSQLITE_VERSION=\"$(PKG_VERSION)\" $(TARGET_CC) $(TARGET_LDFLAGS) -shared \ - $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/lsqlite3.o \ - -o $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/lsqlite3.so + $(PKG_BUILD_DIR)/lsqlite3.o \ + -o $(PKG_BUILD_DIR)/lsqlite3.so endef define Package/lsqlite3/install $(INSTALL_DIR) $(1)/usr/lib/lua - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/*.so $(1)/usr/lib/lua/ + $(CP) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/lua/ endef $(eval $(call BuildPackage,lsqlite3))