diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-02-17 17:25:57 +0000 |
|---|---|---|
| committer | <> | 2015-03-17 16:26:24 +0000 |
| commit | 780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch) | |
| tree | 598f8b9fa431b228d29897e798de4ac0c1d3d970 /dist/jdbc | |
| parent | 7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff) | |
| download | berkeleydb-master.tar.gz | |
Diffstat (limited to 'dist/jdbc')
| -rw-r--r-- | dist/jdbc/jdbc.patch | 36 | ||||
| -rw-r--r-- | dist/jdbc/jdbc.patch2 | 124 |
2 files changed, 160 insertions, 0 deletions
diff --git a/dist/jdbc/jdbc.patch b/dist/jdbc/jdbc.patch new file mode 100644 index 00000000..9519669e --- /dev/null +++ b/dist/jdbc/jdbc.patch @@ -0,0 +1,36 @@ +diff -r e7e24e781211 configure +--- a/configure Wed Jan 09 13:03:42 2013 -0800 ++++ b/configure Tue Jan 22 18:41:16 2013 +0800 +@@ -11420,9 +11420,14 @@ + return ret; + } + ++static int vatest2(va_list ap) { ++ return 0; ++} ++ + int + main(int argc, char **argv) + { ++ vatest2((va_list)argv); /* Check whether we can convert "char *" to va_list */ + exit(vatest(NULL, vatest, 0.0, 0, NULL)); + } + +diff -r e7e24e781211 configure.in +--- a/configure.in Wed Jan 09 13:03:42 2013 -0800 ++++ b/configure.in Tue Jan 22 18:41:16 2013 +0800 +@@ -436,9 +436,14 @@ + return ret; + } + ++static int vatest2(va_list ap) { ++ return 0; ++} ++ + int + main(int argc, char **argv) + { ++ vatest2((va_list)argv); /* Check whether we can convert "char *" to va_list */ + exit(vatest(NULL, vatest, 0.0, 0, NULL)); + } + ],[USE_VFUNCS=1],[USE_VFUNCS=0],[USE_VFUNCS=0]) diff --git a/dist/jdbc/jdbc.patch2 b/dist/jdbc/jdbc.patch2 new file mode 100644 index 00000000..e330896b --- /dev/null +++ b/dist/jdbc/jdbc.patch2 @@ -0,0 +1,124 @@ +diff -r 4ce6bb090c10 configure +--- a/configure Tue Feb 19 11:51:39 2013 -0500 ++++ b/configure Wed Feb 20 12:03:37 2013 +0800 +@@ -10205,6 +10205,29 @@ + + + ++HAVE_SQLITE3_MALLOC=0 ++HAVE_SQLITE3_PREPARE_V2=0 ++HAVE_SQLITE3_PREPARE16_V2=0 ++HAVE_SQLITE3_BIND_ZEROBLOB=0 ++HAVE_SQLITE3_CLEAR_BINDINGS=0 ++HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 ++HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 ++HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 ++HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 ++HAVE_SQLITE3_BIND_PARAMETER_NAME=0 ++HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 ++HAVE_SQLITE3_RESULT_ZEROBLOB=0 ++HAVE_SQLITE3_INCRBLOBIO=0 ++HAVE_SQLITE3_KEY="${HAVE_SQLITE3_KEY:-0}" ++HAVE_SQLITE3_SHARED_CACHE=0 ++HAVE_SQLITE3_OPEN_V2=0 ++HAVE_SQLITE3_LOAD_EXTENSION=0 ++HAVE_SQLITE3_BACKUPAPI=0 ++HAVE_SQLITE3_PROFILE=0 ++HAVE_SQLITE3_STATUS=0 ++HAVE_SQLITE3_DB_STATUS=0 ++HAVE_SQLITE3_STMT_STATUS=0 ++ + ########## + # Find SQLite3 header file and library + # +@@ -10327,28 +10350,6 @@ + fi + + test "x$enable_load_extension" = "xyes" || enable_load_extension=no +-HAVE_SQLITE3_MALLOC=0 +-HAVE_SQLITE3_PREPARE_V2=0 +-HAVE_SQLITE3_PREPARE16_V2=0 +-HAVE_SQLITE3_BIND_ZEROBLOB=0 +-HAVE_SQLITE3_CLEAR_BINDINGS=0 +-HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 +-HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 +-HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 +-HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 +-HAVE_SQLITE3_BIND_PARAMETER_NAME=0 +-HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 +-HAVE_SQLITE3_RESULT_ZEROBLOB=0 +-HAVE_SQLITE3_INCRBLOBIO=0 +-HAVE_SQLITE3_KEY=0 +-HAVE_SQLITE3_SHARED_CACHE=0 +-HAVE_SQLITE3_OPEN_V2=0 +-HAVE_SQLITE3_LOAD_EXTENSION=0 +-HAVE_SQLITE3_BACKUPAPI=0 +-HAVE_SQLITE3_PROFILE=0 +-HAVE_SQLITE3_STATUS=0 +-HAVE_SQLITE3_DB_STATUS=0 +-HAVE_SQLITE3_STMT_STATUS=0 + if test "$HAVE_SQLITE3" = 1 -a -n "$SQLITE3_A10N_C" ; then + HAVE_SQLITE3_MALLOC=1 + HAVE_SQLITE3_PREPARE_V2=1 +diff -r 4ce6bb090c10 configure.in +--- a/configure.in Tue Feb 19 11:51:39 2013 -0500 ++++ b/configure.in Wed Feb 20 12:03:37 2013 +0800 +@@ -147,6 +147,29 @@ + AC_SUBST(HAVE_SQLITE_COMPILE) + AC_SUBST(HAVE_SQLITE_PROGRESS_HANDLER) + ++HAVE_SQLITE3_MALLOC=0 ++HAVE_SQLITE3_PREPARE_V2=0 ++HAVE_SQLITE3_PREPARE16_V2=0 ++HAVE_SQLITE3_BIND_ZEROBLOB=0 ++HAVE_SQLITE3_CLEAR_BINDINGS=0 ++HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 ++HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 ++HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 ++HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 ++HAVE_SQLITE3_BIND_PARAMETER_NAME=0 ++HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 ++HAVE_SQLITE3_RESULT_ZEROBLOB=0 ++HAVE_SQLITE3_INCRBLOBIO=0 ++HAVE_SQLITE3_KEY="${HAVE_SQLITE3_KEY:-0}" ++HAVE_SQLITE3_SHARED_CACHE=0 ++HAVE_SQLITE3_OPEN_V2=0 ++HAVE_SQLITE3_LOAD_EXTENSION=0 ++HAVE_SQLITE3_BACKUPAPI=0 ++HAVE_SQLITE3_PROFILE=0 ++HAVE_SQLITE3_STATUS=0 ++HAVE_SQLITE3_DB_STATUS=0 ++HAVE_SQLITE3_STMT_STATUS=0 ++ + ########## + # Find SQLite3 header file and library + # +@@ -262,28 +285,6 @@ + *** thus should be enabled only if you know what you're doing. *** + *******************************************************************]) + test "x$enable_load_extension" = "xyes" || enable_load_extension=no +-HAVE_SQLITE3_MALLOC=0 +-HAVE_SQLITE3_PREPARE_V2=0 +-HAVE_SQLITE3_PREPARE16_V2=0 +-HAVE_SQLITE3_BIND_ZEROBLOB=0 +-HAVE_SQLITE3_CLEAR_BINDINGS=0 +-HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 +-HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 +-HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 +-HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 +-HAVE_SQLITE3_BIND_PARAMETER_NAME=0 +-HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 +-HAVE_SQLITE3_RESULT_ZEROBLOB=0 +-HAVE_SQLITE3_INCRBLOBIO=0 +-HAVE_SQLITE3_KEY=0 +-HAVE_SQLITE3_SHARED_CACHE=0 +-HAVE_SQLITE3_OPEN_V2=0 +-HAVE_SQLITE3_LOAD_EXTENSION=0 +-HAVE_SQLITE3_BACKUPAPI=0 +-HAVE_SQLITE3_PROFILE=0 +-HAVE_SQLITE3_STATUS=0 +-HAVE_SQLITE3_DB_STATUS=0 +-HAVE_SQLITE3_STMT_STATUS=0 + if test "$HAVE_SQLITE3" = 1 -a -n "$SQLITE3_A10N_C" ; then + HAVE_SQLITE3_MALLOC=1 + HAVE_SQLITE3_PREPARE_V2=1 |