Update SQLite to 3.6.16; ok martynas@
This commit is contained in:
sthen
parent
ce849803dd
commit
4c56e70c0c
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.46 2009/05/12 23:20:52 simon Exp $
|
||||
# $OpenBSD: Makefile,v 1.47 2009/08/03 09:55:47 sthen Exp $
|
||||
|
||||
COMMENT-main= embedded SQL implementation
|
||||
COMMENT-tcl= TCL bindings for Sqlite3
|
||||
COMMENT-lemon= LEMON LALR(1) parser generator
|
||||
V= 3.6.13
|
||||
V= 3.6.16
|
||||
DISTNAME= sqlite-${V}
|
||||
PKGNAME-main= sqlite3-${V}p0
|
||||
PKGNAME-main= sqlite3-${V}
|
||||
PKGNAME-tcl= sqlite3-tcl-${V}
|
||||
PKGNAME-lemon= lemon-${V}
|
||||
CATEGORIES= databases
|
||||
@ -27,7 +27,8 @@ WANTLIB-lemon= c
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
|
||||
CFLAGS+= -DSQLITE_ENABLE_COLUMN_METADATA
|
||||
CFLAGS+= -DSQLITE_ENABLE_COLUMN_METADATA \
|
||||
-DSQLITE_HAVE_ISNAN
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
|
||||
--enable-threads-override-locks \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (sqlite-3.6.13.tar.gz) = ZSoBeX51OIEeSZelhHvAJg==
|
||||
RMD160 (sqlite-3.6.13.tar.gz) = Kps74fCH9jVgumN4SwkLT8+EfVc=
|
||||
SHA1 (sqlite-3.6.13.tar.gz) = YytWYbp/Weks6AXrzfLMPpsooFE=
|
||||
SHA256 (sqlite-3.6.13.tar.gz) = LKJZGEffciJN1vmcj//jW7Y79BqFGdjhWtSBQaqEG/o=
|
||||
SIZE (sqlite-3.6.13.tar.gz) = 2780584
|
||||
MD5 (sqlite-3.6.16.tar.gz) = 18V+kfvrYwwZ+C7sPvc9rg==
|
||||
RMD160 (sqlite-3.6.16.tar.gz) = rTVLSLuwtG/1nCdwi9Cm5+vr/7s=
|
||||
SHA1 (sqlite-3.6.16.tar.gz) = cO9atySBbNbHVfIebp2KnGtRcEU=
|
||||
SHA256 (sqlite-3.6.16.tar.gz) = DG84idpUdnkAvV1DRwCrWiiUB+vYMdD2iaMLxEr7Tc0=
|
||||
SIZE (sqlite-3.6.16.tar.gz) = 2822505
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.13 2009/04/16 20:09:58 martynas Exp $
|
||||
--- Makefile.in.orig Mon Mar 30 19:37:16 2009
|
||||
+++ Makefile.in Sun Apr 5 11:14:52 2009
|
||||
$OpenBSD: patch-Makefile_in,v 1.14 2009/08/03 09:55:47 sthen Exp $
|
||||
--- Makefile.in.orig Thu Jun 25 12:35:50 2009
|
||||
+++ Makefile.in Sun Jun 28 14:40:39 2009
|
||||
@@ -176,11 +176,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.l
|
||||
table.lo tokenize.lo trigger.lo update.lo \
|
||||
util.lo vacuum.lo \
|
||||
@ -43,7 +43,7 @@ $OpenBSD: patch-Makefile_in,v 1.13 2009/04/16 20:09:58 martynas Exp $
|
||||
-rpath "$(TCLLIBDIR)" \
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
@@ -505,6 +506,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
|
||||
@@ -507,6 +508,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
|
||||
sqlite3.lo: sqlite3.c
|
||||
$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
|
||||
|
||||
@ -53,7 +53,7 @@ $OpenBSD: patch-Makefile_in,v 1.13 2009/04/16 20:09:58 martynas Exp $
|
||||
# Rules to build individual files
|
||||
#
|
||||
alter.lo: $(TOP)/src/alter.c $(HDR)
|
||||
@@ -808,6 +812,8 @@ clean:
|
||||
@@ -810,6 +814,8 @@ clean:
|
||||
|
||||
distclean: clean
|
||||
rm -f config.log config.status libtool Makefile sqlite3.pc
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_os_unix_c,v 1.10 2009/05/12 23:20:52 simon Exp $
|
||||
--- src/os_unix.c.orig Thu Apr 9 20:41:18 2009
|
||||
+++ src/os_unix.c Thu Apr 23 17:50:03 2009
|
||||
$OpenBSD: patch-src_os_unix_c,v 1.11 2009/08/03 09:55:47 sthen Exp $
|
||||
--- src/os_unix.c.orig Thu Jun 25 12:45:58 2009
|
||||
+++ src/os_unix.c Sun Jun 28 14:40:40 2009
|
||||
@@ -111,6 +111,14 @@
|
||||
# define _LARGEFILE_SOURCE 1
|
||||
#endif
|
||||
@ -107,7 +107,7 @@ $OpenBSD: patch-src_os_unix_c,v 1.10 2009/05/12 23:20:52 simon Exp $
|
||||
static int transferOwnership(unixFile *pFile){
|
||||
int rc;
|
||||
pthread_t hSelf;
|
||||
@@ -3936,7 +3947,7 @@ static void *unixDlOpen(sqlite3_vfs *NotUsed, const ch
|
||||
@@ -3937,7 +3948,7 @@ static void *unixDlOpen(sqlite3_vfs *NotUsed, const ch
|
||||
** error message.
|
||||
*/
|
||||
static void unixDlError(sqlite3_vfs *NotUsed, int nBuf, char *zBufOut){
|
||||
@ -116,7 +116,7 @@ $OpenBSD: patch-src_os_unix_c,v 1.10 2009/05/12 23:20:52 simon Exp $
|
||||
UNUSED_PARAMETER(NotUsed);
|
||||
unixEnterMutex();
|
||||
zErr = dlerror();
|
||||
@@ -4002,7 +4013,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
|
||||
@@ -4003,7 +4014,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
|
||||
#if !defined(SQLITE_TEST)
|
||||
{
|
||||
int pid, fd;
|
||||
@ -125,7 +125,7 @@ $OpenBSD: patch-src_os_unix_c,v 1.10 2009/05/12 23:20:52 simon Exp $
|
||||
if( fd<0 ){
|
||||
time_t t;
|
||||
time(&t);
|
||||
@@ -4307,7 +4318,7 @@ static int proxyGenerateHostID(char *pHostID){
|
||||
@@ -4312,7 +4323,7 @@ static int proxyGenerateHostID(char *pHostID){
|
||||
|
||||
memset(key, 0, HOSTIDLEN);
|
||||
len = 0;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_sqliteInt_h,v 1.4 2009/04/16 20:09:58 martynas Exp $
|
||||
--- src/sqliteInt.h.orig Mon Mar 30 19:37:16 2009
|
||||
+++ src/sqliteInt.h Sun Apr 5 11:14:52 2009
|
||||
$OpenBSD: patch-src_sqliteInt_h,v 1.5 2009/08/03 09:55:47 sthen Exp $
|
||||
--- src/sqliteInt.h.orig Fri Jun 26 16:14:55 2009
|
||||
+++ src/sqliteInt.h Sun Jun 28 14:40:40 2009
|
||||
@@ -35,11 +35,6 @@
|
||||
#pragma warn -spa /* Suspicious pointer arithmetic */
|
||||
#endif
|
||||
@ -13,9 +13,9 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.4 2009/04/16 20:09:58 martynas Exp $
|
||||
/*
|
||||
** Include standard header files as necessary
|
||||
*/
|
||||
@@ -416,33 +411,26 @@ typedef INT16_TYPE i16; /* 2-byte signed in
|
||||
typedef UINT8_TYPE u8; /* 1-byte unsigned integer */
|
||||
typedef INT8_TYPE i8; /* 1-byte signed integer */
|
||||
@@ -439,33 +434,26 @@ typedef INT8_TYPE i8; /* 1-byte signed in
|
||||
*/
|
||||
#define SQLITE_MAX_U32 ((((u64)1)<<32)-1)
|
||||
|
||||
-/*
|
||||
-** Macros to determine whether the machine is big or little endian,
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
$OpenBSD: patch-src_util_c,v 1.4 2009/04/05 00:02:54 martynas Exp $
|
||||
--- src/util.c.orig Sun Feb 15 15:07:11 2009
|
||||
+++ src/util.c Sun Mar 22 13:29:53 2009
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#include <stdarg.h>
|
||||
+#include <math.h>
|
||||
|
||||
/*
|
||||
** Routine needed to support the testcase() macro.
|
||||
@@ -54,29 +55,7 @@ int sqlite3Assert(void){
|
||||
** Return true if the floating point value is Not a Number (NaN).
|
||||
*/
|
||||
int sqlite3IsNaN(double x){
|
||||
- /* This NaN test sometimes fails if compiled on GCC with -ffast-math.
|
||||
- ** On the other hand, the use of -ffast-math comes with the following
|
||||
- ** warning:
|
||||
- **
|
||||
- ** This option [-ffast-math] should never be turned on by any
|
||||
- ** -O option since it can result in incorrect output for programs
|
||||
- ** which depend on an exact implementation of IEEE or ISO
|
||||
- ** rules/specifications for math functions.
|
||||
- **
|
||||
- ** Under MSVC, this NaN test may fail if compiled with a floating-
|
||||
- ** point precision mode other than /fp:precise. From the MSDN
|
||||
- ** documentation:
|
||||
- **
|
||||
- ** The compiler [with /fp:precise] will properly handle comparisons
|
||||
- ** involving NaN. For example, x != x evaluates to true if x is NaN
|
||||
- ** ...
|
||||
- */
|
||||
-#ifdef __FAST_MATH__
|
||||
-# error SQLite will not work correctly with the -ffast-math option of GCC.
|
||||
-#endif
|
||||
- volatile double y = x;
|
||||
- volatile double z = y;
|
||||
- return y!=z;
|
||||
+ return isnan(x);
|
||||
}
|
||||
|
||||
/*
|
||||
Loading…
Reference in New Issue
Block a user