Fossil SCM
Since fossil now uses sqlite_malloc64, which is introduced in SQLite 3.8.7, don't accept linkage using earlier SQLite versions any more.
Commit
a481a8176b9fa8ab9cdd71c45d8d5fa6109c2b45
Parent
5a87a0314e33b6b…
2 files changed
+2
-2
+2
-2
M
auto.def
+2
-2
| --- auto.def | ||
| +++ auto.def | ||
| @@ -51,12 +51,12 @@ | ||
| 51 | 51 | # if sqlite3_strglob() can be found as well. If we can find open() but |
| 52 | 52 | # not strglob(), then the system SQLite is too old to link against |
| 53 | 53 | # fossil. |
| 54 | 54 | # |
| 55 | 55 | if {[cc-check-function-in-lib sqlite3_open sqlite3 $extralibs]} { |
| 56 | - if {![cc-check-function-in-lib sqlite3_strglob sqlite3 $extralibs]} { | |
| 57 | - user-error "system sqlite3 too old (require >= 3.7.17)" | |
| 56 | + if {![cc-check-function-in-lib sqlite3_malloc64 sqlite3 $extralibs]} { | |
| 57 | + user-error "system sqlite3 too old (require >= 3.8.7)" | |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | # Success. Update symbols and return. |
| 61 | 61 | # |
| 62 | 62 | define USE_SYSTEM_SQLITE 1 |
| 63 | 63 |
| --- auto.def | |
| +++ auto.def | |
| @@ -51,12 +51,12 @@ | |
| 51 | # if sqlite3_strglob() can be found as well. If we can find open() but |
| 52 | # not strglob(), then the system SQLite is too old to link against |
| 53 | # fossil. |
| 54 | # |
| 55 | if {[cc-check-function-in-lib sqlite3_open sqlite3 $extralibs]} { |
| 56 | if {![cc-check-function-in-lib sqlite3_strglob sqlite3 $extralibs]} { |
| 57 | user-error "system sqlite3 too old (require >= 3.7.17)" |
| 58 | } |
| 59 | |
| 60 | # Success. Update symbols and return. |
| 61 | # |
| 62 | define USE_SYSTEM_SQLITE 1 |
| 63 |
| --- auto.def | |
| +++ auto.def | |
| @@ -51,12 +51,12 @@ | |
| 51 | # if sqlite3_strglob() can be found as well. If we can find open() but |
| 52 | # not strglob(), then the system SQLite is too old to link against |
| 53 | # fossil. |
| 54 | # |
| 55 | if {[cc-check-function-in-lib sqlite3_open sqlite3 $extralibs]} { |
| 56 | if {![cc-check-function-in-lib sqlite3_malloc64 sqlite3 $extralibs]} { |
| 57 | user-error "system sqlite3 too old (require >= 3.8.7)" |
| 58 | } |
| 59 | |
| 60 | # Success. Update symbols and return. |
| 61 | # |
| 62 | define USE_SYSTEM_SQLITE 1 |
| 63 |
+2
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -590,12 +590,12 @@ | ||
| 590 | 590 | #endif |
| 591 | 591 | { |
| 592 | 592 | const char *zCmdName = "unknown"; |
| 593 | 593 | int idx; |
| 594 | 594 | int rc; |
| 595 | - if( sqlite3_libversion_number()<3008003 ){ | |
| 596 | - fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.3", | |
| 595 | + if( sqlite3_libversion_number()<3008007 ){ | |
| 596 | + fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.7", | |
| 597 | 597 | sqlite3_libversion()); |
| 598 | 598 | } |
| 599 | 599 | sqlite3_config(SQLITE_CONFIG_MULTITHREAD); |
| 600 | 600 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 601 | 601 | memset(&g, 0, sizeof(g)); |
| 602 | 602 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -590,12 +590,12 @@ | |
| 590 | #endif |
| 591 | { |
| 592 | const char *zCmdName = "unknown"; |
| 593 | int idx; |
| 594 | int rc; |
| 595 | if( sqlite3_libversion_number()<3008003 ){ |
| 596 | fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.3", |
| 597 | sqlite3_libversion()); |
| 598 | } |
| 599 | sqlite3_config(SQLITE_CONFIG_MULTITHREAD); |
| 600 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 601 | memset(&g, 0, sizeof(g)); |
| 602 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -590,12 +590,12 @@ | |
| 590 | #endif |
| 591 | { |
| 592 | const char *zCmdName = "unknown"; |
| 593 | int idx; |
| 594 | int rc; |
| 595 | if( sqlite3_libversion_number()<3008007 ){ |
| 596 | fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.7", |
| 597 | sqlite3_libversion()); |
| 598 | } |
| 599 | sqlite3_config(SQLITE_CONFIG_MULTITHREAD); |
| 600 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 601 | memset(&g, 0, sizeof(g)); |
| 602 |