From: dan <dan@noemail.net>
Date: Fri, 13 Oct 2017 14:20:15 +0000 (+0000)
Subject: Update main.mk to build the sqlite3_expert program with -DSQLITE_THREADSAFE=0
X-Git-Tag: version-3.22.0~147^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae542401d801b95b5805f3f291a2f64ee074df90;p=thirdparty%2Fsqlite.git

Update main.mk to build the sqlite3_expert program with -DSQLITE_THREADSAFE=0
and -DSQLITE_OMIT_LOAD_EXTENSION. To minimize dependencies.

FossilOrigin-Name: 4c68ad7da48c941eb1ca0210a85d95467f3f3640bdc55a02686166471806ca4e
---

diff --git a/main.mk b/main.mk
index bfbfee1a4e..a92a8137f5 100644
--- a/main.mk
+++ b/main.mk
@@ -788,7 +788,7 @@ sqlite3_analyzer$(EXE): sqlite3_analyzer.c
 	$(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(THREADLIB) 
 
 sqlite3_expert$(EXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
-	$(TCCX) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(THREADLIB)
+	$(TCCX) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(THREADLIB)
 
 dbdump$(EXE):	$(TOP)/ext/misc/dbdump.c sqlite3.o
 	$(TCCX) -DDBDUMP_STANDALONE -o dbdump$(EXE) \
diff --git a/manifest b/manifest
index 6df14defa2..bf28bea373 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sEXPLAIN\sprocessing\sso\sthat\sit\sreturns\sSQLITE_ERROR\son\san\sOOM,\sas\sit\nshould.
-D 2017-10-12T20:24:09.195
+C Update\smain.mk\sto\sbuild\sthe\ssqlite3_expert\sprogram\swith\s-DSQLITE_THREADSAFE=0\nand\s-DSQLITE_OMIT_LOAD_EXTENSION.\sTo\sminimize\sdependencies.
+D 2017-10-13T14:20:15.203
 F Makefile.in 51259a193f348a96b0ebc60ad84cfe83fdeecdd1d0ecb24f0e278a35ac1449da
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e3fd2bfdf18211892e3f09db7e2841753fe61cc0747a0b0e87d77406840c3f6e
@@ -388,7 +388,7 @@ F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 4ba2640f924e022ec66cadcb629e7e1d01aeb1932a004f92abc6238eac1c6a56
+F main.mk 6ec9f289c46fdc66928782d7ff0d1b07c2e4c6ca553a3fe4f94e793ac53e8db6
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1662,7 +1662,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d325da6c50f2f9c10f50b3839f87c155876c339879bb8bdb82567b5ff34ef7ba
-R 6202e14e92fa1dfd47a763d4d423b320
-U drh
-Z 6985a8a5847e041f83568bb74bfda40b
+P 4ec63ef233c9239d3d383a99c234ef6604d55a9838c16f57e56c2a120aeb63c4
+R d11eafd1958fe2d9bdec327b55b3ebe5
+U dan
+Z 3e15c410e04c5e53e4b05cff4437d5be
diff --git a/manifest.uuid b/manifest.uuid
index ca99924a85..424d577e4a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ec63ef233c9239d3d383a99c234ef6604d55a9838c16f57e56c2a120aeb63c4
\ No newline at end of file
+4c68ad7da48c941eb1ca0210a85d95467f3f3640bdc55a02686166471806ca4e
\ No newline at end of file