X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1f96d69f566aa785c0f0fb4fb25e6198a96bb4c3..652be0c3cf26fb7d19723bd016d70dfb9f8f1aa3:/openwrt/package/sqlite/Makefile

diff --git a/openwrt/package/sqlite/Makefile b/openwrt/package/sqlite/Makefile
index f36a004c7..aefb458a1 100644
--- a/openwrt/package/sqlite/Makefile
+++ b/openwrt/package/sqlite/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sqlite
-PKG_VERSION:=3.2.1
+PKG_VERSION:=3.2.8
 PKG_RELEASE:=1
-PKG_MD5SUM:=ccf3831c2f67452d444c5e5e2c7ca6f0
+PKG_MD5SUM:=9f2c014aaa46565b8163e047166a5686
 
 PKG_SOURCE_URL:=http://www.sqlite.org/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -23,8 +23,8 @@ $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		config_BUILD_CC="$(HOSTCC)" \
 		config_BUILD_CFLAGS="-O2" \
 		config_TARGET_CC="$(TARGET_CC)" \
@@ -32,28 +32,28 @@ $(PKG_BUILD_DIR)/.configured:
 		config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
 		config_TARGET_READLINE_LIBS="-L$(STAGING_DIR)/usr/lib -lreadline -lncurses" \
 		./configure \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
-		  --program-suffix="" \
-		  --prefix=/usr \
-		  --exec-prefix=/usr \
-		  --bindir=/usr/bin \
-		  --datadir=/usr/share \
-		  --includedir=/usr/include \
-		  --infodir=/usr/share/info \
-		  --libdir=/usr/lib \
-		  --libexecdir=/usr/lib \
-		  --localstatedir=/var \
-		  --mandir=/usr/share/man \
-		  --sbindir=/usr/sbin \
-		  --sysconfdir=/etc \
-		  $(DISABLE_LARGEFILE) \
-		  $(DISABLE_NLS) \
-		  --enable-shared \
-		  --enable-static \
-		  --disable-tcl \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			$(DISABLE_LARGEFILE) \
+			$(DISABLE_NLS) \
+			--enable-shared \
+			--enable-static \
+			--disable-tcl \
 	);
 	touch $@
 
@@ -67,23 +67,23 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBSQLITE):
 	install -d -m0755 $(IDIR_LIBSQLITE)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(IDIR_LIBSQLITE)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(IDIR_LIBSQLITE)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBSQLITE)
 	$(IPKG_BUILD) $(IDIR_LIBSQLITE) $(PACKAGE_DIR)
 
 $(IPKG_SQLITE_CLI):
 	install -d -m0755 $(IDIR_SQLITE_CLI)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(IDIR_SQLITE_CLI)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(IDIR_SQLITE_CLI)/usr/bin/
 	$(RSTRIP) $(IDIR_SQLITE_CLI)
 	$(IPKG_BUILD) $(IDIR_SQLITE_CLI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libsqlite3.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/
 	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libsqlite3.so
@@ -96,3 +96,7 @@ uninstall-dev:
 
 compile-targets: install-dev
 clean-targets: uninstall-dev
+
+mostlyclean:
+	-$(MAKE) -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built