update to latest upstream version

4 files changed, 12 insertions, 50 deletions

diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index d1c290edf..3306bdb75 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -4,20 +4,24 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		sqlite
-PKG_VERSION:=		3.7.3
+PKG_VERSION:=		3.7.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5437978aae90350cf984993091e0d695
-PKG_DESCR:=		embeddable SQL database
+PKG_MD5SUM:=		a9604a82613ade2e7f4c303f233e477f
+PKG_DESCR:=		embeddable SQL database (cli)
 PKG_SECTION:=		db
 PKG_BUILDDEP:=		ncurses readline
 PKG_URL:=		http://www.sqlite.org/
 PKG_SITES:=		http://www.sqlite.org/
 
-PKG_SUBPKGS:=		LIBSQLITE SQLITE_CLI
+DISTFILES:=		sqlite-autoconf-3070500.tar.gz
+WRKDIST=		${WRKDIR}/sqlite-autoconf-3070500
+
+PKG_SUBPKGS:=		SQLITE_CLI LIBSQLITE
+PKGSD_LIBSQLITE:=	sqlite library
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSQLITE},${PKG_SECTION}))
 $(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		config_BUILD_CC="${CC_FOR_BUILD}" \
@@ -33,9 +37,11 @@ CONFIGURE_ARGS+=	--disable-tcl \
 			--without-tcl \
 			--disable-amalgamation
 
-post-install:
+libsqlite-install:
 	${INSTALL_DIR} ${IDIR_LIBSQLITE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libsqlite3.so* ${IDIR_LIBSQLITE}/usr/lib
+
+sqlite-cli-install:
 	${INSTALL_DIR} ${IDIR_SQLITE_CLI}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/sqlite3 ${IDIR_SQLITE_CLI}/usr/bin
 
diff --git a/package/sqlite/patches/patch-Makefile_in b/package/sqlite/patches/patch-Makefile_in
deleted file mode 100644
index 3be3a2861..000000000
--- a/package/sqlite/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sqlite-3.7.3.orig/Makefile.in	2010-10-07 16:48:41.000000000 +0200
-+++ sqlite-3.7.3/Makefile.in	2010-11-25 20:15:04.156939429 +0100
-@@ -181,7 +181,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo
-          table.lo tokenize.lo trigger.lo \
-          update.lo util.lo vacuum.lo \
-          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbetrace.lo \
--         wal.lo walker.lo where.lo utf.o vtab.lo
-+         wal.lo walker.lo where.lo utf.lo vtab.lo
- 
- # Object files for the amalgamation.
- #
diff --git a/package/sqlite/patches/patch-configure b/package/sqlite/patches/patch-configure
deleted file mode 100644
index f4a1d91fd..000000000
--- a/package/sqlite/patches/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- sqlite-3.7.3.orig/configure	2010-10-07 16:48:41.000000000 +0200
-+++ sqlite-3.7.3/configure	2011-03-04 21:58:45.000000000 +0100
-@@ -12389,8 +12389,8 @@ fi
- # generate command-line programs that run on the build machine.
- #
- if test x"$cross_compiling" = xno; then
--	BUILD_CC=$CC
--	BUILD_CFLAGS=$CFLAGS
-+	BUILD_CC=$CC_FOR_BUILD
-+	BUILD_CFLAGS=$CFLAGS_FOR_BUILD
- else
- 	if test "${BUILD_CC+set}" != set; then
- 		for ac_prog in gcc cc cl
-@@ -12437,7 +12437,7 @@ done
- 
- 	fi
- 	if test "${BUILD_CFLAGS+set}" != set; then
--		BUILD_CFLAGS="-g"
-+		BUILD_CFLAGS=$CFLAGS_FOR_BUILD
- 	fi
- fi
- 
diff --git a/package/sqlite/patches/patch-ltmain_sh b/package/sqlite/patches/patch-ltmain_sh
deleted file mode 100644
index 7f7d44cb0..000000000
--- a/package/sqlite/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- sqlite-3.7.3.orig/ltmain.sh	2010-10-01 22:19:27.000000000 +0200
-+++ sqlite-3.7.3/ltmain.sh	2011-01-15 00:16:55.000000000 +0100
-@@ -4772,7 +4772,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"