cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't define SQLITE_ENABLE_COLUMN_METADATA. This is used in DBD::SQLite's code

Browse Source 
and should match the status for the sqlite build. (Normally DBD::SQLite uses
its own copy of the library, but we patch to use ports sqlite instead).
Fixes runtime breakage with clang, fixes "make test" with gcc, but somehow
runtime seemed to work with gcc..?!
This commit is contained in:
sthen 2017-04-24 16:25:04 +00:00
parent 993c80fd1a
commit 6d30bd8e6e
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
databases/p5-DBD-SQLite/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.40 2016/09/23 09:16:53 sthen Exp $
# $OpenBSD: Makefile,v 1.41 2017/04/24 16:25:04 sthen Exp $
COMMENT= SQLite drivers for the Perl DBI
MODULES= cpan
DISTNAME= DBD-SQLite-1.50
EPOCH= 0
CATEGORIES= databases
REVISION= 0
EPOCH= 0
REVISION= 1
MAINTAINER= Robert Nagy <robert@openbsd.org>

24
databases/p5-DBD-SQLite/patches/patch-Makefile_PL
View File

@ -1,9 +1,15 @@
Upstream forces use of bundled sqlite but we use the one from ports.
$OpenBSD: patch-Makefile_PL,v 1.11 2017/04/24 16:25:05 sthen Exp $
$OpenBSD: patch-Makefile_PL,v 1.10 2012/01/22 11:29:55 nigel Exp $
--- Makefile.PL.orig Tue Nov 29 00:05:51 2011
+++ Makefile.PL Sun Dec 18 14:06:22 2011
@@ -124,7 +124,7 @@ SCOPE: {
- Upstream forces use of bundled sqlite but we use the one from ports.
- Ports sqlite is built without -DSQLITE_ENABLE_COLUMN_METADATA;
DBD::SQLite uses this as a conditional in its own code as well in the built
copy of sqlite, so it needs to follow what's done in the sqlite build.
--- Makefile.PL.orig Thu Nov 5 05:26:07 2015
+++ Makefile.PL Mon Apr 24 17:20:34 2017
@@ -129,7 +129,7 @@ SCOPE: {
# a system sqlite is also sophisticated enough to have a patching system
# that can change the if ( 0 ) to if ( 1 )
my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
@ -12,3 +18,11 @@ $OpenBSD: patch-Makefile_PL,v 1.10 2012/01/22 11:29:55 nigel Exp $
require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
@@ -223,7 +223,6 @@ my @CC_DEFINE = (
'-DSQLITE_ENABLE_FTS4', # for sqlite >= 3.7.4
'-DSQLITE_ENABLE_FTS3_PARENTHESIS', # for sqlite >= 3.6.10
'-DSQLITE_ENABLE_RTREE', # for sqlite >= 3.6.10
- '-DSQLITE_ENABLE_COLUMN_METADATA',
'-DSQLITE_ENABLE_STAT3', # for sqlite >= 3.7.9
'-DSQLITE_ENABLE_STAT4', # for sqlite >= 3.8.3.1
'-DSQLITE_ENABLE_JSON1', # for sqlite >= 3.9.0