Fossil SCM
Update custom makefile as well. If fossil is linked with external SQLite library, make sure it is used single-threaded.
Commit
1928cf526ef478b4edb88ca4d85643d4df526773
Parent
28c508679e0dfc5…
2 files changed
+1
+1
-1
+1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -551,10 +551,11 @@ | ||
| 551 | 551 | #endif |
| 552 | 552 | { |
| 553 | 553 | const char *zCmdName = "unknown"; |
| 554 | 554 | int idx; |
| 555 | 555 | int rc; |
| 556 | + sqlite3_config(SQLITE_CONFIG_SINGLETHREAD); | |
| 556 | 557 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 557 | 558 | memset(&g, 0, sizeof(g)); |
| 558 | 559 | g.now = time(0); |
| 559 | 560 | g.httpHeader = empty_blob; |
| 560 | 561 | #ifdef FOSSIL_ENABLE_JSON |
| 561 | 562 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -551,10 +551,11 @@ | |
| 551 | #endif |
| 552 | { |
| 553 | const char *zCmdName = "unknown"; |
| 554 | int idx; |
| 555 | int rc; |
| 556 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 557 | memset(&g, 0, sizeof(g)); |
| 558 | g.now = time(0); |
| 559 | g.httpHeader = empty_blob; |
| 560 | #ifdef FOSSIL_ENABLE_JSON |
| 561 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -551,10 +551,11 @@ | |
| 551 | #endif |
| 552 | { |
| 553 | const char *zCmdName = "unknown"; |
| 554 | int idx; |
| 555 | int rc; |
| 556 | sqlite3_config(SQLITE_CONFIG_SINGLETHREAD); |
| 557 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 558 | memset(&g, 0, sizeof(g)); |
| 559 | g.now = time(0); |
| 560 | g.httpHeader = empty_blob; |
| 561 | #ifdef FOSSIL_ENABLE_JSON |
| 562 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -1685,11 +1685,11 @@ | ||
| 1685 | 1685 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1686 | 1686 | |
| 1687 | 1687 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1688 | 1688 | |
| 1689 | 1689 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1690 | - $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o | |
| 1690 | + $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o | |
| 1691 | 1691 | |
| 1692 | 1692 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1693 | 1693 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1694 | 1694 | |
| 1695 | 1695 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1696 | 1696 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1685,11 +1685,11 @@ | |
| 1685 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1686 | |
| 1687 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1688 | |
| 1689 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1690 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1691 | |
| 1692 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1693 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1694 | |
| 1695 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1696 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1685,11 +1685,11 @@ | |
| 1685 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1686 | |
| 1687 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1688 | |
| 1689 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1690 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1691 | |
| 1692 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1693 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1694 | |
| 1695 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1696 |