Fossil SCM
Better align the SQLite compilation options used by the makemake.tcl script with those listed on the makefile wiki page.
Commit
00d6eea822303dc53ccfb95e98747a3bdd92cb5d
Parent
afbc49cd2728a0e…
2 files changed
+2
-2
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -129,17 +129,17 @@ | ||
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | # Options used to compile the included SQLite library. |
| 132 | 132 | # |
| 133 | 133 | set SQLITE_OPTIONS { |
| 134 | + -Dlocaltime=fossil_localtime | |
| 134 | 135 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 136 | + -DSQLITE_ENABLE_LOCKING_STYLE=0 | |
| 135 | 137 | -DSQLITE_THREADSAFE=0 |
| 136 | 138 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 137 | 139 | -DSQLITE_OMIT_DEPRECATED |
| 138 | 140 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 139 | - -Dlocaltime=fossil_localtime | |
| 140 | - -DSQLITE_ENABLE_LOCKING_STYLE=0 | |
| 141 | 141 | } |
| 142 | 142 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 143 | 143 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 144 | 144 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 145 | 145 | #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096 |
| 146 | 146 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -129,17 +129,17 @@ | |
| 129 | } |
| 130 | |
| 131 | # Options used to compile the included SQLite library. |
| 132 | # |
| 133 | set SQLITE_OPTIONS { |
| 134 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 135 | -DSQLITE_THREADSAFE=0 |
| 136 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 137 | -DSQLITE_OMIT_DEPRECATED |
| 138 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 139 | -Dlocaltime=fossil_localtime |
| 140 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 141 | } |
| 142 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 143 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 144 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 145 | #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096 |
| 146 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -129,17 +129,17 @@ | |
| 129 | } |
| 130 | |
| 131 | # Options used to compile the included SQLite library. |
| 132 | # |
| 133 | set SQLITE_OPTIONS { |
| 134 | -Dlocaltime=fossil_localtime |
| 135 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 136 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 137 | -DSQLITE_THREADSAFE=0 |
| 138 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 139 | -DSQLITE_OMIT_DEPRECATED |
| 140 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 141 | } |
| 142 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 143 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 144 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 145 | #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096 |
| 146 |
-1
| --- www/makefile.wiki | ||
| +++ www/makefile.wiki | ||
| @@ -208,11 +208,10 @@ | ||
| 208 | 208 | * -Dlocaltime=fossil_localtime |
| 209 | 209 | * -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 210 | 210 | * -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 211 | 211 | * -DSQLITE_THREADSAFE=0 |
| 212 | 212 | * -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 213 | - * -DSQLITE_ENABLE_STAT3 | |
| 214 | 213 | |
| 215 | 214 | The first and second symbol definitions above are required; the others |
| 216 | 215 | are merely recommended. The "localtime()" library function in SQLite must |
| 217 | 216 | be redefined to invoke fossil_localtime() instead. The fossil_localtime() |
| 218 | 217 | routine will invoke either gmtime() or localtime() depending on the |
| 219 | 218 |
| --- www/makefile.wiki | |
| +++ www/makefile.wiki | |
| @@ -208,11 +208,10 @@ | |
| 208 | * -Dlocaltime=fossil_localtime |
| 209 | * -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 210 | * -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 211 | * -DSQLITE_THREADSAFE=0 |
| 212 | * -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 213 | * -DSQLITE_ENABLE_STAT3 |
| 214 | |
| 215 | The first and second symbol definitions above are required; the others |
| 216 | are merely recommended. The "localtime()" library function in SQLite must |
| 217 | be redefined to invoke fossil_localtime() instead. The fossil_localtime() |
| 218 | routine will invoke either gmtime() or localtime() depending on the |
| 219 |
| --- www/makefile.wiki | |
| +++ www/makefile.wiki | |
| @@ -208,11 +208,10 @@ | |
| 208 | * -Dlocaltime=fossil_localtime |
| 209 | * -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 210 | * -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 211 | * -DSQLITE_THREADSAFE=0 |
| 212 | * -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 213 | |
| 214 | The first and second symbol definitions above are required; the others |
| 215 | are merely recommended. The "localtime()" library function in SQLite must |
| 216 | be redefined to invoke fossil_localtime() instead. The fossil_localtime() |
| 217 | routine will invoke either gmtime() or localtime() depending on the |
| 218 |