From: drh <drh@noemail.net>
Date: Tue, 3 Sep 2019 16:23:41 +0000 (+0000)
Subject: Updates to the default settings in Makefile.linux-gcc.
X-Git-Tag: version-3.30.0~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7dc3547eeb691d5397e9dc55206daab0927937d8;p=thirdparty%2Fsqlite.git

Updates to the default settings in Makefile.linux-gcc.

FossilOrigin-Name: 3044cf6917ea8324175fc91657e9a5978af9748f72e1914bc361753f0b2d897d
---

diff --git a/Makefile.linux-gcc b/Makefile.linux-gcc
index 1491a4b02a..ad5d4dd093 100644
--- a/Makefile.linux-gcc
+++ b/Makefile.linux-gcc
@@ -19,7 +19,7 @@ TOP = ../sqlite
 #### C Compiler and options for use in building executables that
 #    will run on the platform that is doing the build.
 #
-BCC = gcc -g -O2
+BCC = gcc -g -O0
 #BCC = /opt/ancic/bin/c89 -0
 
 #### If the target operating system supports the "usleep()" system
@@ -38,8 +38,8 @@ THREADSAFE = -DTHREADSAFE=0
 #### Specify any extra linker options needed to make the library
 #    thread safe
 #
-#THREADLIB = -lpthread
-THREADLIB = 
+THREADLIB = -lpthread -lm -ldl
+#THREADLIB = 
 
 #### Specify any extra libraries needed to access required functions.
 #
@@ -54,11 +54,9 @@ TLIBS =
 #    You can make the library go almost twice as fast if you compile
 #    with -DNDEBUG=1
 #
-#OPTS = -DSQLITE_DEBUG=2
-#OPTS = -DSQLITE_DEBUG=1
-#OPTS = 
-OPTS = -DNDEBUG=1
-OPTS += -DHAVE_FDATASYNC=1
+OPTS += -DSQLITE_DEBUG=1
+OPTS += -DSQLITE_ENABLE_WHERETRACE
+OPTS += -DSQLITE_ENABLE_SELECTTRACE
 
 #### The suffix to add to executable files.  ".exe" for windows.
 #    Nothing for unix.
@@ -70,7 +68,7 @@ EXE =
 #    will run on the target platform.  This is usually the same
 #    as BCC, unless you are cross-compiling.
 #
-TCC = gcc -O6
+TCC = gcc -O0
 #TCC = gcc -g -O0 -Wall
 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
 #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
@@ -91,18 +89,12 @@ SHPREFIX = lib
 
 #### Extra compiler options needed for programs that use the TCL library.
 #
-#TCL_FLAGS =
-#TCL_FLAGS = -DSTATIC_BUILD=1
-TCL_FLAGS = -I/home/drh/tcltk/8.5linux
-#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
-#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
+TCL_FLAGS = -I/home/drh/tcl/include/tcl8.6
 
 #### Linker options needed to link against the TCL library.
 #
 #LIBTCL = -ltcl -lm -ldl
-LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
-#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
-#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
+LIBTCL = /home/drh/tcl/lib/libtcl8.6.a -lm -lpthread -ldl -lz
 
 #### Additional objects for SQLite library when TCL support is enabled.
 #TCLOBJ =
diff --git a/manifest b/manifest
index 05386d4075..3921cbfbc9 100644
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C When\swe\splay\sgames\swith\sCOLLATE\sin\sorder\sto\scommute\san\soperator\sin\sthe\nWHERE\sclause\sprocessing,\sbe\ssure\snot\sto\suse\sthe\scommuted\soperator\sto\squalify\na\spartial\sindex,\sas\sinsufficient\sCOLLATE\sinformation\sis\spreserved\sto\sverify\nthat\sthe\sexpression\swill\scorrectly\squalify\sthe\sindex.\nTicket\s[767a8cbc6d20bd68]
-D 2019-09-03T14:27:25.935
+C Updates\sto\sthe\sdefault\ssettings\sin\sMakefile.linux-gcc.
+D 2019-09-03T16:23:41.278
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 578f123620087ea459aa08fa872810a25ca7c0aaf16331de985bfcddb5f1e747
-F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
+F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc a463dca3c50d8a36094fe5c8c39077907f530b54edfc5388c66c85e2cfc8dc04
 F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
 F VERSION 4c516d84c2a5f26c477ed34c09ac4136630f71c68139631f2eb591b22eea7cf1
@@ -1839,7 +1839,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 6e7b4527d32cc1be0294614b9d7363d4b59cf654a954b86515b3f6888975ce73
-R f93cc76f663e94933b1f2f65b53349fd
+P 5351e920f489562f959ab8a376ff720f845ea165e0cdc7c3a271aac53c2aa64a
+R 925cc947a7aaed39ac73d111ffc8ed4f
 U drh
-Z 391da90ad359183d92b0ba19729274a1
+Z 4a725e18713a18c2d331c90a708c61ac
diff --git a/manifest.uuid b/manifest.uuid
index 63c1adf712..c360ee3192 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5351e920f489562f959ab8a376ff720f845ea165e0cdc7c3a271aac53c2aa64a
\ No newline at end of file
+3044cf6917ea8324175fc91657e9a5978af9748f72e1914bc361753f0b2d897d
\ No newline at end of file