components/perl_modules/dbd-sqlite/patches/03_do_not_use_local_header.patch
author Vladimir Marek <Vladimir.Marek@oracle.com>
Tue, 03 May 2016 15:43:41 +0200
changeset 5927 0b2f72b7196c
permissions -rw-r--r--
22756512 Update DBD::SQLite to 1.50
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5927
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     1
Filed at https://rt.cpan.org/Public/Bug/Display.html?id=114138
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     2
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     3
--- DBD-SQLite-1.50/Makefile.PL	2016-05-02 13:32:35.562004677 -0700
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     4
+++ DBD-SQLite-1.50/Makefile.PL	2016-05-02 13:31:31.215124807 -0700
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     5
@@ -170,6 +170,7 @@ if ( 0 ) {
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     6
 				while ( defined($_ = <$fh>) ) {
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     7
 					if (/\#define\s+SQLITE_VERSION_NUMBER\s+(\d+)/) {
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     8
 						$version = $1;
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     9
+						$sqlite_inc = File::Spec->catdir( '', @$dir );
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    10
 						last;
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    11
 					}
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    12
 				}
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    13
@@ -216,7 +217,7 @@ my @CC_INC = (
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    14
 	'-I$(DBI_INSTARCH_DIR)',
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    15
 );
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    16
 if ( $sqlite_inc ) {
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    17
-	push @CC_INC, "-I$sqlite_inc";
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    18
+	unshift @CC_INC, "-I$sqlite_inc";
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    19
 }
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    20
 
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    21
 my @CC_DEFINE = (
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    22
--- DBD-SQLite-1.50/sqlite3ext.h	2016-05-02 13:40:28.734661242 -0700
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    23
+++ DBD-SQLite-1.50/sqlite3ext.h	2016-05-02 13:39:16.724889276 -0700
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    24
@@ -17,7 +17,7 @@
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    25
 */
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    26
 #ifndef _SQLITE3EXT_H_
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    27
 #define _SQLITE3EXT_H_
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    28
-#include "sqlite3.h"
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    29
+#include <sqlite3.h>
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    30
 
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    31
 typedef struct sqlite3_api_routines sqlite3_api_routines;
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    32
 
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    33
--- DBD-SQLite-1.50/dbdimp.h	2016-05-02 13:40:28.956772954 -0700
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    34
+++ DBD-SQLite-1.50/dbdimp.h	2016-05-02 13:39:23.563370124 -0700
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    35
@@ -3,7 +3,7 @@
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    36
 #define _DBDIMP_H   1
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    37
 
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    38
 #include "SQLiteXS.h"
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    39
-#include "sqlite3.h"
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    40
+#include <sqlite3.h>
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    41
 
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    42
 #define MY_CXT_KEY "DBD::SQLite::_guts" XS_VERSION
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    43
 
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    44
--- DBD-SQLite-1.50/SQLiteXS.h	2016-05-02 13:40:29.181387425 -0700
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    45
+++ DBD-SQLite-1.50/SQLiteXS.h	2016-05-02 13:39:36.956291908 -0700
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    46
@@ -18,7 +18,7 @@
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    47
 #include "dbivport.h"
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    48
 #include <dbd_xsh.h>
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    49
 
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    50
-#include "sqlite3.h"
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    51
+#include <sqlite3.h>
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    52
 #include "fts3_tokenizer.h"
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    53
 
0b2f72b7196c 22756512 Update DBD::SQLite to 1.50
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    54
 #endif