Sat Jan 4 02:32:13 2020 UTC ()
sqlite3: remove a workaround that's no longer needed

There have been multiple version updates to this package since that was
added and it was already fixed upstream.


(gutteridge)
diff -r1.131 -r1.132 pkgsrc/databases/sqlite3/Makefile
cvs diff -r1.131 -r1.132 pkgsrc/databases/sqlite3/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/sqlite3/Makefile 2019/04/18 10:10:03 1.131
+++ pkgsrc/databases/sqlite3/Makefile 2020/01/04 02:32:13 1.132
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.131 2019/04/18 10:10:03 adam Exp $ 1# $NetBSD: Makefile,v 1.132 2020/01/04 02:32:13 gutteridge Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5DISTNAME= sqlite-autoconf-${SQLITE3_DISTVERSION} 5DISTNAME= sqlite-autoconf-${SQLITE3_DISTVERSION}
6PKGNAME= sqlite3-${SQLITE3_VERSION} 6PKGNAME= sqlite3-${SQLITE3_VERSION}
7CATEGORIES= databases 7CATEGORIES= databases
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= SQL Database Engine in a C Library 10COMMENT= SQL Database Engine in a C Library
11 11
12.include "options.mk" 12.include "options.mk"
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -16,30 +16,26 @@ USE_TOOLS+= gmake @@ -16,30 +16,26 @@ USE_TOOLS+= gmake
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --disable-static-shell 17CONFIGURE_ARGS+= --disable-static-shell
18 18
19PKGCONFIG_OVERRIDE+= sqlite3.pc.in 19PKGCONFIG_OVERRIDE+= sqlite3.pc.in
20 20
21INSTALLATION_DIRS+= ${PKGMANDIR}/man1 21INSTALLATION_DIRS+= ${PKGMANDIR}/man1
22 22
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24 24
25# In the past, Linux had database corruption issues with pread, so 25# In the past, Linux had database corruption issues with pread, so
26# only enable it on safe platforms. 26# only enable it on safe platforms.
27CFLAGS.NetBSD+= -DUSE_PREAD 27CFLAGS.NetBSD+= -DUSE_PREAD
28 28
29# This issue is fixed upstream and will be in the next release, so remove this 
30# on the next update (https://bugzilla.mozilla.org/show_bug.cgi?id=1340028) 
31CFLAGS.Darwin+= -DSQLITE_DISABLE_INTRINSIC 
32 
33# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 29# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
34# and lacks the zone memory allocator 30# and lacks the zone memory allocator
35.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 31.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
36CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC 32CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
37.endif 33.endif
38 34
39# This define includes the sqlite3_unlock_notify() API in the build. 35# This define includes the sqlite3_unlock_notify() API in the build.
40# It is required by Firefox 4.x. 36# It is required by Firefox 4.x.
41CFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 37CFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1
42# The following are defined in the NetBSD builtin version. 38# The following are defined in the NetBSD builtin version.
43CFLAGS+= -DSQLITE_ENABLE_COLUMN_METADATA 39CFLAGS+= -DSQLITE_ENABLE_COLUMN_METADATA
44CFLAGS+= -DSQLITE_ENABLE_LOAD_EXTENSION 40CFLAGS+= -DSQLITE_ENABLE_LOAD_EXTENSION
45 41