6d30bd8e6e
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..?!
29 lines
1.2 KiB
Plaintext
29 lines
1.2 KiB
Plaintext
$OpenBSD: patch-Makefile_PL,v 1.11 2017/04/24 16:25:05 sthen Exp $
|
|
|
|
- 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);
|
|
-if ( 0 ) {
|
|
+if ( 1 ) {
|
|
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
|