Attachment 113321 Details for Bug 154844 – sqlite3-3.7.5.patch

[patch] sqlite3-3.7.5.patch

sqlite3-3.7.5.patch (text/plain), 4.38 KB, created by Pavel I Volkov on 2011-02-17 14:00:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel I Volkov

Created: 2011-02-17 14:00:23 UTC

Size: 4.38 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/Makefile /usr/ports/databases/sqlite3/Makefile
>--- /usr/ports/databases/sqlite3.orig/Makefile	2011-02-14 13:48:36.000000000 +0300
>+++ /usr/ports/databases/sqlite3/Makefile	2011-02-17 16:18:27.000000000 +0300
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	sqlite3
>-PORTVERSION=	3.7.4
>+PORTVERSION=	3.7.5
> CATEGORIES=	databases
> MASTER_SITES=	http://www.sqlite.org/ http://www2.sqlite.org/
>-DISTNAME=	sqlite-src-3070400
>+DISTNAME=	sqlite-src-3070500
> 
> MAINTAINER=	pavelivolkov@googlemail.com
> COMMENT=	An SQL database engine in a C library
>@@ -39,7 +39,7 @@
> # Compilation Options For SQLite http://www.sqlite.org/compile.html
> OPTIONS=	\
> 		FTS3		"Enable FTS3/4 (Full Text Search) module" on \
>-		ICU		"Enable built with \"ICU\""		off \
>+		ICU		"Enable built with ICU"			off \
> 		RTREE		"Enable R*Tree module"			off \
> 		RAMTABLE	"Store temporary tables in RAM = ${RAMTABLE}" off \
> 		UPD_DEL_LIMIT	"ORDER BY and LIMIT on UPDATE and DELETE" off \
>@@ -52,8 +52,6 @@
> 		THREADSAFE	"Build thread-safe library"		on \
> 		EXTENSION	"Allow loadable extensions"		on \
> 		TCLWRAPPER	"Enable TCL wrapper"			off \
>-		DEBUG		"Enable debugging & verbose explain"	off \
>-		GCOV		"Enable coverage testing using gcov (broken)"	off \
> 
> .include <bsd.port.options.mk>
> 
>@@ -70,17 +68,41 @@
> EXTRA_PATCHES+=		${FILESDIR}/pthread_equal_stub
> .endif
> 
>+#		DEBUG	"Enable debugging & verbose explain"	off \
>+# This options used only for debug and is not required during normal work
>+# applications or its libraries.
>+#    This options can be specified on the command line.
>+# Execute: make -D WITH_DEBUG ...
> .if defined(WITH_DEBUG)
> CONFIGURE_ARGS+=	--enable-debug
> CFLAGS+=		-Wall
> .endif
> 
>+#		GCOV	"Enable coverage testing using gcov/gprof"	off \
>+# These options are only used for debugging, profiling the application.
>+# And can cause errors when using the application or its libraries in other
>+# products (for example build security/nss is BROKEN).
>+#    This options can be specified on the command line.
>+# Execute: make -D WITH_GCOV ...
> .if defined(WITH_GCOV)
>-BROKEN=	WITH_GCOV breaks security/nss
> CONFIGURE_ARGS+=	--enable-gcov
> LDFLAGS+=		-fstack-protector
> .endif
> 
>+#    By default, the sqlite3_step() interface will automatically invoke
>+# sqlite3_reset() to reset the prepared statement if necessary. This
>+# compile-time option changes that behavior so that sqlite3_step() will
>+# return SQLITE_MISUSE if it called again after returning anything other
>+# than SQLITE_ROW, SQLITE_BUSY, or SQLITE_LOCKED unless there was an
>+# intervening call to sqlite3_reset().
>+#    A detailed description of this option, the compile can be found here:
>+# http://www.sqlite.org/compile.html#omit_autoreset
>+#    This options can be specified on the command line.
>+# Execute: make -D WITH_OMIT_AUTORESET ...
>+.if defined(WITH_OMIT_AUTORESET)
>+CFLAGS+=		-DSQLITE_OMIT_AUTORESET=1
>+.endif
>+
> # This macro sets the default size of the page-cache for temporary files
> # created by SQLite to store intermediate results, in pages.
> .ifdef TEMP_CACHE_SIZE
>@@ -167,7 +189,7 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${TCL_VER} > 8.4
>+.if defined(TCL_VER) && ${TCL_VER} > 8.4
> BUILD_DEPENDS+=		${LOCALBASE}/lib/tcl8/${TCL_VER}:${PORTSDIR}/lang/tcl-modules
> .if defined(WITH_TCLWRAPPER)
> RUN_DEPENDS+=		${LOCALBASE}/lib/tcl8/${TCL_VER}:${PORTSDIR}/lang/tcl-modules
>@@ -181,10 +203,13 @@
> .ifndef TESTUSER
> IGNORE=	set the value of the variable TESTUSER corresponding normal (not root) user, from which will be tested
> .endif
>+.ifndef WITH_TCLWRAPPER
>+IGNORE=	for the purpose of test you want to include TCL wrapper
>+.endif
> .endif
> 
> test: build
>-	@(cd ${WRKSRC} && ${CHOWN} ${TESTUSER} ${WRKSRC} && su ${TESTUSER} -c "${MAKE} test"; ${CHOWN} ${USER} ${WRKSRC})
>+	@(cd ${WRKSRC} && ${CHOWN} -R ${TESTUSER} ${WRKSRC} && su ${TESTUSER} -c "${MAKE} test"; ${CHOWN} ${USER} ${WRKSRC})
> 
> post-build:
> 	@${ECHO_CMD}
>diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/distinfo /usr/ports/databases/sqlite3/distinfo
>--- /usr/ports/databases/sqlite3.orig/distinfo	2011-02-14 13:48:36.000000000 +0300
>+++ /usr/ports/databases/sqlite3/distinfo	2011-02-14 13:51:00.000000000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (sqlite-src-3070400.zip) = e7540069fad017a9dec374241b346570ce6c360e2960749ddcacac81f965c9b4
>-SIZE (sqlite-src-3070400.zip) = 3997962
>+SHA256 (sqlite-src-3070500.zip) = 1bb838c02b4946c514e28cfcd1c15b0079f8626f5fbcfcf2b48e2a075acc5c51
>+SIZE (sqlite-src-3070500.zip) = 3987471

Actions: View | Diff

Attachments on bug 154844: 113321