Update to sqlite 3.7.5, enable UNLOCK_NOTIFY api (needed by firefox 4).

Tested by phessler@ on loongson/sparc, jasper@ on arm, myself on
amd64/sparc64/macppc, and went through a pair of amd64 bulk builds
without issues.
ok sthen@ dcoppa@
This commit is contained in:
landry 2011-03-14 14:39:51 +00:00
parent d8265bb180
commit 2c9ebc2459
4 changed files with 23 additions and 30 deletions

View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.56 2011/01/10 08:11:56 landry Exp $
# $OpenBSD: Makefile,v 1.57 2011/03/14 14:39:51 landry Exp $
COMMENT-main= embedded SQL implementation
COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
V= 3.7.4
DISTNAME= sqlite-src-3070400
V= 3.7.5
DISTNAME= sqlite-src-3070500
EXTRACT_SUFX = .zip
PKGNAME-main= sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
PKGNAME-lemon= lemon-${V}
CATEGORIES= databases
SHARED_LIBS += sqlite3 15.0 # .8.6
SHARED_LIBS += sqlite3 15.1 # .8.6
MASTER_SITES= ${HOMEPAGE}
@ -32,6 +32,7 @@ CFLAGS+= -DSQLITE_ENABLE_COLUMN_METADATA \
-DSQLITE_HAVE_ISNAN \
-DSQLITE_SOUNDEX \
-DSQLITE_ENABLE_RTREE \
-DSQLITE_ENABLE_UNLOCK_NOTIFY \
-DSQLITE_ENABLE_FTS3
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED}

View File

@ -1,5 +1,5 @@
MD5 (sqlite-src-3070400.zip) = K1xTMoUFiTWZ3m4gVZlteg==
RMD160 (sqlite-src-3070400.zip) = qu1kV88sYz08g8RhEqp6holHrc8=
SHA1 (sqlite-src-3070400.zip) = wNBBeOWhjhzgM+A1qE3alyXd2Yg=
SHA256 (sqlite-src-3070400.zip) = 51QAafrQF6new3QkGzRlcM5sNg4pYHSd3KysgfllybQ=
SIZE (sqlite-src-3070400.zip) = 3997962
MD5 (sqlite-src-3070500.zip) = 1h14SZfULNDZK6x5lAlMVg==
RMD160 (sqlite-src-3070500.zip) = TV8gkXAOnBg+hhYTIDod22YhfA8=
SHA1 (sqlite-src-3070500.zip) = lwYRDWNcNH4W3bjOobSSM4X+z6w=
SHA256 (sqlite-src-3070500.zip) = G7g4wCtJRsUU4oz80cFbAHn4Ym9fvPzytI4qB1rMXFE=
SIZE (sqlite-src-3070500.zip) = 3987471

View File

@ -1,15 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.16 2011/01/09 19:11:34 landry Exp $
--- Makefile.in.orig Wed Dec 8 18:00:47 2010
+++ Makefile.in Wed Dec 8 18:12:47 2010
@@ -61,7 +61,6 @@ TCC += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@
# Do threads override each others locks by default (1), or do we test (-1)
#
-TCC += -DSQLITE_THREAD_OVERRIDE_LOCK=@THREADSOVERRIDELOCKS@
# Any target libraries which libsqlite must be linked against
#
@@ -190,7 +189,7 @@ LIBOBJS1 = sqlite3.lo
$OpenBSD: patch-Makefile_in,v 1.17 2011/03/14 14:39:51 landry Exp $
--- Makefile.in.orig Thu Mar 10 17:55:45 2011
+++ Makefile.in Thu Mar 10 18:01:04 2011
@@ -186,7 +186,7 @@ LIBOBJS1 = sqlite3.lo
# Determine the real value of LIBOBJ based on the 'configure' script
#
@ -18,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.16 2011/01/09 19:11:34 landry Exp $
# All of the source code files.
@@ -286,6 +285,8 @@ SRC = \
@@ -282,6 +282,8 @@ SRC = \
$(TOP)/src/walker.c \
$(TOP)/src/where.c
@ -27,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.16 2011/01/09 19:11:34 landry Exp $
# Source code for extensions
#
SRC += \
@@ -761,6 +762,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
@@ -757,6 +759,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
$(LTLINK) -o $@ tclsqlite-shell.lo \
libsqlite3.la $(LIBTCL)
@ -37,7 +29,7 @@ $OpenBSD: patch-Makefile_in,v 1.16 2011/01/09 19:11:34 landry Exp $
# Rules to build opcodes.c and opcodes.h
#
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
@@ -781,7 +785,11 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
@@ -777,7 +782,11 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
$(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
@ -50,7 +42,7 @@ $OpenBSD: patch-Makefile_in,v 1.16 2011/01/09 19:11:34 landry Exp $
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
@@ -854,7 +862,7 @@ TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLIT
@@ -850,7 +859,7 @@ TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLIT
TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
@ -59,7 +51,7 @@ $OpenBSD: patch-Makefile_in,v 1.16 2011/01/09 19:11:34 landry Exp $
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
testfixture$(TEXE): $(TESTFIXTURE_SRC)
@@ -922,6 +930,8 @@ clean:
@@ -918,6 +927,8 @@ clean:
distclean: clean
rm -f config.log config.status libtool Makefile sqlite3.pc

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.10 2011/01/09 19:11:34 landry Exp $
--- configure.orig Mon Nov 22 07:54:11 2010
+++ configure Mon Nov 22 07:55:56 2010
@@ -12498,8 +12498,8 @@ for ac_lib in '' pthread; do
$OpenBSD: patch-configure,v 1.11 2011/03/14 14:39:51 landry Exp $
--- configure.orig Thu Jan 27 19:40:56 2011
+++ configure Thu Mar 10 17:55:23 2011
@@ -12494,8 +12494,8 @@ for ac_lib in '' pthread; do
if test -z "$ac_lib"; then
ac_res="none required"
else