Fossil SCM
Since fossil now uses the function sqlite_strlike(), don't allow it to build/run with SQLite versions < 3.10.0 any more.
Commit
8ed01e8021d4154f57ba014e8cc6e6188df91a43
Parent
f7a5e10ce933728…
2 files changed
+4
-4
+2
-2
M
auto.def
+4
-4
| --- auto.def | ||
| +++ auto.def | ||
| @@ -86,17 +86,17 @@ | ||
| 86 | 86 | # the code below will append -ldl to LIBS. |
| 87 | 87 | # |
| 88 | 88 | foreach extralibs {{} {-ldl}} { |
| 89 | 89 | |
| 90 | 90 | # Locate the system SQLite by searching for sqlite3_open(). Then check |
| 91 | - # if sqlite3_strglob() can be found as well. If we can find open() but | |
| 92 | - # not strglob(), then the system SQLite is too old to link against | |
| 91 | + # if sqlite3_strlike() can be found as well. If we can find open() but | |
| 92 | + # not strlike(), then the system SQLite is too old to link against | |
| 93 | 93 | # fossil. |
| 94 | 94 | # |
| 95 | 95 | if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} { |
| 96 | - if {![check-function-in-lib sqlite3_malloc64 sqlite3 $extralibs]} { | |
| 97 | - user-error "system sqlite3 too old (require >= 3.8.7)" | |
| 96 | + if {![check-function-in-lib sqlite3_strlike sqlite3 $extralibs]} { | |
| 97 | + user-error "system sqlite3 too old (require >= 3.10.0)" | |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | # Success. Update symbols and return. |
| 101 | 101 | # |
| 102 | 102 | define USE_SYSTEM_SQLITE 1 |
| 103 | 103 |
| --- auto.def | |
| +++ auto.def | |
| @@ -86,17 +86,17 @@ | |
| 86 | # the code below will append -ldl to LIBS. |
| 87 | # |
| 88 | foreach extralibs {{} {-ldl}} { |
| 89 | |
| 90 | # Locate the system SQLite by searching for sqlite3_open(). Then check |
| 91 | # if sqlite3_strglob() can be found as well. If we can find open() but |
| 92 | # not strglob(), then the system SQLite is too old to link against |
| 93 | # fossil. |
| 94 | # |
| 95 | if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} { |
| 96 | if {![check-function-in-lib sqlite3_malloc64 sqlite3 $extralibs]} { |
| 97 | user-error "system sqlite3 too old (require >= 3.8.7)" |
| 98 | } |
| 99 | |
| 100 | # Success. Update symbols and return. |
| 101 | # |
| 102 | define USE_SYSTEM_SQLITE 1 |
| 103 |
| --- auto.def | |
| +++ auto.def | |
| @@ -86,17 +86,17 @@ | |
| 86 | # the code below will append -ldl to LIBS. |
| 87 | # |
| 88 | foreach extralibs {{} {-ldl}} { |
| 89 | |
| 90 | # Locate the system SQLite by searching for sqlite3_open(). Then check |
| 91 | # if sqlite3_strlike() can be found as well. If we can find open() but |
| 92 | # not strlike(), then the system SQLite is too old to link against |
| 93 | # fossil. |
| 94 | # |
| 95 | if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} { |
| 96 | if {![check-function-in-lib sqlite3_strlike sqlite3 $extralibs]} { |
| 97 | user-error "system sqlite3 too old (require >= 3.10.0)" |
| 98 | } |
| 99 | |
| 100 | # Success. Update symbols and return. |
| 101 | # |
| 102 | define USE_SYSTEM_SQLITE 1 |
| 103 |
+2
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -592,12 +592,12 @@ | ||
| 592 | 592 | #endif |
| 593 | 593 | { |
| 594 | 594 | const char *zCmdName = "unknown"; |
| 595 | 595 | int idx; |
| 596 | 596 | int rc; |
| 597 | - if( sqlite3_libversion_number()<3008007 ){ | |
| 598 | - fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.7", | |
| 597 | + if( sqlite3_libversion_number()<3010000 ){ | |
| 598 | + fossil_fatal("Unsuitable SQLite version %s, must be at least 3.10.0", | |
| 599 | 599 | sqlite3_libversion()); |
| 600 | 600 | } |
| 601 | 601 | sqlite3_config(SQLITE_CONFIG_MULTITHREAD); |
| 602 | 602 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 603 | 603 | memset(&g, 0, sizeof(g)); |
| 604 | 604 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -592,12 +592,12 @@ | |
| 592 | #endif |
| 593 | { |
| 594 | const char *zCmdName = "unknown"; |
| 595 | int idx; |
| 596 | int rc; |
| 597 | if( sqlite3_libversion_number()<3008007 ){ |
| 598 | fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.7", |
| 599 | sqlite3_libversion()); |
| 600 | } |
| 601 | sqlite3_config(SQLITE_CONFIG_MULTITHREAD); |
| 602 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 603 | memset(&g, 0, sizeof(g)); |
| 604 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -592,12 +592,12 @@ | |
| 592 | #endif |
| 593 | { |
| 594 | const char *zCmdName = "unknown"; |
| 595 | int idx; |
| 596 | int rc; |
| 597 | if( sqlite3_libversion_number()<3010000 ){ |
| 598 | fossil_fatal("Unsuitable SQLite version %s, must be at least 3.10.0", |
| 599 | sqlite3_libversion()); |
| 600 | } |
| 601 | sqlite3_config(SQLITE_CONFIG_MULTITHREAD); |
| 602 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 603 | memset(&g, 0, sizeof(g)); |
| 604 |