update to 3.7.14.1 as well, ditch outdated -pthread patch
This commit is contained in:
espie
parent
c8b555b603
commit
2582d2679e
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.67 2012/07/13 16:16:18 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.68 2012/11/29 05:32:04 espie Exp $
|
||||
|
||||
COMMENT-main= embedded SQL implementation
|
||||
COMMENT-tcl= TCL bindings for Sqlite3
|
||||
COMMENT-lemon= LEMON LALR(1) parser generator
|
||||
V= 3.7.13
|
||||
DISTNAME= sqlite-src-3071300
|
||||
V= 3.7.14.1
|
||||
DISTNAME= sqlite-src-3071401
|
||||
EXTRACT_SUFX = .zip
|
||||
PKGNAME-main= sqlite3-${V}
|
||||
PKGNAME-tcl= sqlite3-tcl-${V}
|
||||
@ -12,7 +12,6 @@ PKGNAME-lemon= lemon-${V}
|
||||
CATEGORIES= databases
|
||||
IGNORE-main = "--${FULLPKGNAME-main} comes with OpenBSD as of release 5.2"
|
||||
SUBPACKAGE ?= -lemon
|
||||
REVISION-tcl = 0
|
||||
|
||||
MASTER_SITES= ${HOMEPAGE}
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (sqlite-src-3071300.zip) = TPmzc8vfHhrn80O0DopAB7KY3uFabKeQb+/6EsY28Rg=
|
||||
SIZE (sqlite-src-3071300.zip) = 4923284
|
||||
SHA256 (sqlite-src-3071401.zip) = y6bCSM2rmGROVKT3yzeNDzcUWSFGA6w9Ui6xqKQhXO0=
|
||||
SIZE (sqlite-src-3071401.zip) = 4966093
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.20 2012/05/01 14:29:56 espie Exp $
|
||||
--- Makefile.in.orig Tue Mar 20 15:20:13 2012
|
||||
+++ Makefile.in Sat Apr 28 15:40:57 2012
|
||||
@@ -186,7 +186,7 @@ LIBOBJS1 = sqlite3.lo
|
||||
$OpenBSD: patch-Makefile_in,v 1.21 2012/11/29 05:32:04 espie Exp $
|
||||
--- Makefile.in.orig Thu Oct 4 21:49:23 2012
|
||||
+++ Makefile.in Thu Nov 29 06:30:18 2012
|
||||
@@ -187,7 +187,7 @@ LIBOBJS1 = sqlite3.lo
|
||||
|
||||
# Determine the real value of LIBOBJ based on the 'configure' script
|
||||
#
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.20 2012/05/01 14:29:56 espie Exp $
|
||||
|
||||
|
||||
# All of the source code files.
|
||||
@@ -283,6 +283,8 @@ SRC = \
|
||||
@@ -282,6 +282,8 @@ SRC = \
|
||||
$(TOP)/src/walker.c \
|
||||
$(TOP)/src/where.c
|
||||
|
||||
@ -40,7 +40,7 @@ $OpenBSD: patch-Makefile_in,v 1.20 2012/05/01 14:29:56 espie Exp $
|
||||
-rpath "$(TCLLIBDIR)" \
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
@@ -778,6 +780,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
|
||||
@@ -772,6 +774,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
|
||||
$(LTLINK) -o $@ tclsqlite-shell.lo \
|
||||
libsqlite3.la $(LIBTCL)
|
||||
|
||||
@ -50,7 +50,7 @@ $OpenBSD: patch-Makefile_in,v 1.20 2012/05/01 14:29:56 espie Exp $
|
||||
# Rules to build opcodes.c and opcodes.h
|
||||
#
|
||||
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
|
||||
@@ -798,8 +803,12 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
|
||||
@@ -792,8 +797,12 @@ 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
|
||||
@ -96,7 +96,7 @@ $OpenBSD: patch-Makefile_in,v 1.20 2012/05/01 14:29:56 espie Exp $
|
||||
$(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
|
||||
$(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)
|
||||
rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a
|
||||
@@ -944,6 +947,8 @@ clean:
|
||||
@@ -945,6 +948,8 @@ clean:
|
||||
|
||||
distclean: clean
|
||||
rm -f config.log config.status libtool Makefile sqlite3.pc
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.14 2012/03/27 18:34:04 sthen Exp $
|
||||
|
||||
XXX careful! this must apply to pthread and not any other lib.
|
||||
|
||||
if updating, to include additional context to help avoid problems later,
|
||||
use a hand-rolled patch or 'make update-patches DIFF_ARGS=-u6'.
|
||||
|
||||
|
||||
--- configure.orig Tue Mar 20 14:20:13 2012
|
||||
+++ configure Mon Mar 26 11:16:23 2012
|
||||
@@ -12494,14 +12494,14 @@ return pthread_create ();
|
||||
}
|
||||
_ACEOF
|
||||
for ac_lib in '' pthread; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
- ac_res=-l$ac_lib
|
||||
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
||||
+ ac_res=-$ac_lib
|
||||
+ LIBS="-$ac_lib $ac_func_search_save_LIBS"
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_sqliteInt_h,v 1.10 2012/03/27 18:34:04 sthen Exp $
|
||||
--- src/sqliteInt.h.orig Tue Mar 20 14:20:13 2012
|
||||
+++ src/sqliteInt.h Mon Mar 26 11:17:20 2012
|
||||
$OpenBSD: patch-src_sqliteInt_h,v 1.11 2012/11/29 05:32:04 espie Exp $
|
||||
--- src/sqliteInt.h.orig Thu Oct 4 21:49:22 2012
|
||||
+++ src/sqliteInt.h Thu Nov 29 06:30:18 2012
|
||||
@@ -61,11 +61,6 @@
|
||||
#pragma warn -spa /* Suspicious pointer arithmetic */
|
||||
#endif
|
||||
@ -13,7 +13,7 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.10 2012/03/27 18:34:04 sthen Exp $
|
||||
/*
|
||||
** Include standard header files as necessary
|
||||
*/
|
||||
@@ -464,33 +459,26 @@ typedef INT8_TYPE i8; /* 1-byte signed in
|
||||
@@ -480,33 +475,26 @@ typedef INT8_TYPE i8; /* 1-byte signed in
|
||||
typedef u32 tRowcnt; /* 32-bit is the default */
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_sqlite_h_in,v 1.4 2010/04/02 20:07:11 sthen Exp $
|
||||
--- src/sqlite.h.in.orig Mon Mar 8 15:08:55 2010
|
||||
+++ src/sqlite.h.in Fri Mar 26 19:44:15 2010
|
||||
$OpenBSD: patch-src_sqlite_h_in,v 1.5 2012/11/29 05:32:04 espie Exp $
|
||||
--- src/sqlite.h.in.orig Thu Oct 4 21:49:22 2012
|
||||
+++ src/sqlite.h.in Thu Nov 29 06:30:18 2012
|
||||
@@ -33,6 +33,7 @@
|
||||
#ifndef _SQLITE3_H_
|
||||
#define _SQLITE3_H_
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-src_sqlite_h_in,v 1.4 2010/04/02 20:07:11 sthen Exp $
|
||||
|
||||
/*
|
||||
** Make sure we can call this stuff from C++.
|
||||
@@ -237,6 +238,9 @@ typedef struct sqlite3 sqlite3;
|
||||
@@ -238,6 +239,9 @@ typedef struct sqlite3 sqlite3;
|
||||
** sqlite3_uint64 and sqlite_uint64 types can store integer values
|
||||
** between 0 and +18446744073709551615 inclusive.
|
||||
*/
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-src_sqlite_h_in,v 1.4 2010/04/02 20:07:11 sthen Exp $
|
||||
#ifdef SQLITE_INT64_TYPE
|
||||
typedef SQLITE_INT64_TYPE sqlite_int64;
|
||||
typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;
|
||||
@@ -246,6 +250,7 @@ typedef struct sqlite3 sqlite3;
|
||||
@@ -247,6 +251,7 @@ typedef struct sqlite3 sqlite3;
|
||||
#else
|
||||
typedef long long int sqlite_int64;
|
||||
typedef unsigned long long int sqlite_uint64;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user