summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authortnn <tnn>2009-02-21 19:39:43 +0000
committertnn <tnn>2009-02-21 19:39:43 +0000
commit0e0bbb04122b2bab9533aa95ccb42f1a75acaad3 (patch)
tree254e141c731dfd3e95aef6810ca2d5c82eb29ea8 /databases
parent3a774d82c516a15bce7bbfb8e819a9af59e22ccd (diff)
downloadpkgsrc-0e0bbb04122b2bab9533aa95ccb42f1a75acaad3.tar.gz
patch from upstream: sqlite3 fails to build when tcl is not installed.
Also set ac_cv_prog_TCLSH_CMD="" so the configure script won't find tcl.
Diffstat (limited to 'databases')
-rw-r--r--databases/sqlite3/Makefile3
-rw-r--r--databases/sqlite3/distinfo4
-rw-r--r--databases/sqlite3/patches/patch-aa21
3 files changed, 24 insertions, 4 deletions
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 2e470ba9a2c..059d98eb38a 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/12/31 20:37:09 epg Exp $
+# $NetBSD: Makefile,v 1.17 2009/02/21 19:39:43 tnn Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
CONFIGURE_ARGS+= --disable-tcl
+CONFIGURE_ENV+= ac_cv_prog_TCLSH_CMD=""
CONFIGURE_ARGS+= --enable-load-extension
CONFIGURE_ARGS+= --with-readline-inc=
diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo
index 365ae920057..c0c64da353c 100644
--- a/databases/sqlite3/distinfo
+++ b/databases/sqlite3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.30 2009/02/18 19:13:04 adam Exp $
+$NetBSD: distinfo,v 1.31 2009/02/21 19:39:44 tnn Exp $
SHA1 (sqlite-3.6.11.tar.gz) = bd1c371784d990f7b5e99c841e58deb87fbf4b6e
RMD160 (sqlite-3.6.11.tar.gz) = c38d82c83f5d64cfb302e3232c507bafb0b64e74
Size (sqlite-3.6.11.tar.gz) = 2804714 bytes
-SHA1 (patch-aa) = 32d7901440c682601b58770fe5bc1f26bf4d92fe
+SHA1 (patch-aa) = f50e634e3a9de7599e84673e4989e93307ef926e
diff --git a/databases/sqlite3/patches/patch-aa b/databases/sqlite3/patches/patch-aa
index 2a90bc38e3f..f20541b6144 100644
--- a/databases/sqlite3/patches/patch-aa
+++ b/databases/sqlite3/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2009/02/18 19:13:04 adam Exp $
+$NetBSD: patch-aa,v 1.6 2009/02/21 19:39:44 tnn Exp $
--- Makefile.in.orig 2009-02-15 14:07:08.000000000 +0100
+++ Makefile.in
+@@ -163,7 +163,7 @@ NAWK = @AWK@
+
+ # Object files for the SQLite library (non-amalgamation).
+ #
+-OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \
++OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
+ btree.lo build.lo callback.lo complete.lo date.lo \
+ delete.lo expr.lo fault.lo func.lo global.lo \
+ hash.lo journal.lo insert.lo legacy.lo loadext.lo \
@@ -466,7 +466,7 @@ libsqlite3.la: $(LIBOBJ)
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
@@ -11,3 +20,13 @@ $NetBSD: patch-aa,v 1.5 2009/02/18 19:13:04 adam Exp $
-rpath "$(TCLLIBDIR)" \
-version-info "8:6:8" \
-avoid-version
+@@ -518,6 +518,9 @@ attach.lo: $(TOP)/src/attach.c $(HDR)
+ auth.lo: $(TOP)/src/auth.c $(HDR)
+ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/auth.c
+
++backup.lo: $(TOP)/src/backup.c $(HDR)
++ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/backup.c
++
+ bitvec.lo: $(TOP)/src/bitvec.c $(HDR)
+ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/bitvec.c
+