[packages] lsqlite3: actually link against libsqlite3, fixes segfault when accessing...

[openwrt/svn-archive/archive.git] / lang / lsqlite3 / Makefile

diff --git a/lang/lsqlite3/Makefile b/lang/lsqlite3/Makefile
index 6a4adcdf8c5fede61df837392c111568b97625a4..b5e15d3f2dbcc510d1fbb8c433ec5e22573a9920 100644 (file)
--- a/lang/lsqlite3/Makefile
+++ b/lang/lsqlite3/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lsqlite3
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lsqlite3

-PKG_VERSION:=6
-PKG_RELEASE:=1
+PKG_VERSION:=7
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2565
-PKG_MD5SUM:=368da52fc52b9c5ba122f8f348db332b
+PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4472
+PKG_MD5SUM:=ef7afdd3ea7a29333daa951cda3175bb

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -35,18 +35,15 @@ endef
 
 TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS) -std=c99
 
 
 TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS) -std=c99
 

-TARGET_LDFLAGS += -llua
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               SQLITE3INC="$(STAGING_DIR)/usr/include/" \
-               SQLITE3LIB="$(STAGING_DIR)/usr/lib/" \
-               LUAINC="$(TARGET_CPPFLAGS)" \
-               LUALIB="$(TARGET_LDFLAGS)" \
-               LIBS="-shared $(TARGET_LDFLAGS)" \
-               CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-               LD="$(TARGET_CROSS)ld -shared"
-endef
+TARGET_LDFLAGS += -llua -lsqlite3
+
+MAKE_FLAGS += \
+       CC="$(TARGET_CC)" \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       INCS="$(TARGET_CPPFLAGS)" \
+       LIBS="$(TARGET_LDFLAGS)" \
+       SHFLAGS="-shared" \
+       UNAME="Linux"

 
 define Package/lsqlite3/install
        $(INSTALL_DIR) $(1)/usr/lib/lua
 
 define Package/lsqlite3/install
        $(INSTALL_DIR) $(1)/usr/lib/lua