Add fix from [bfab759611b0] to sqltclsh. Remove some now-unneeded has_tclsh84/5 check...

FossilOrigin-Name: 9d389b998317c5006876f2f40d56cd763d1555bbeaf48b2bca9bd46dcd02b80e

diff --git a/main.mk b/main.mk
index 144c1e2b589c0434704fddcb7d9c20c690096c21..e2458c54815ebb884f6264b7a7b1c2ea533e6964 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -1031,7 +1031,7 @@ T.link.tcl = $(T.tcl.env.source); $(T.link)
 # all that automatic generation.
 #
 .target_source: $(MAKE_SANITY_CHECK) $(SRC) $(TOP)/tool/vdbe-compress.tcl \
-    fts5.c $(B.tclsh) # has_tclsh84
+    fts5.c $(B.tclsh)
        rm -rf tsrc
        mkdir tsrc
        cp -f $(SRC) tsrc
@@ -1057,19 +1057,19 @@ mksourceid$(B.exe): $(MAKE_SANITY_CHECK) $(TOP)/tool/mksourceid.c
 
 sqlite3.h: $(MAKE_SANITY_CHECK) $(TOP)/src/sqlite.h.in \
     $(TOP)/manifest mksourceid$(B.exe) \
-               $(TOP)/VERSION $(B.tclsh) # has_tclsh84
+               $(TOP)/VERSION $(B.tclsh)
        $(B.tclsh) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
 
 sqlite3.c:     .target_source sqlite3.h $(TOP)/tool/mksqlite3c.tcl src-verify$(B.exe) \
-               $(B.tclsh) # has_tclsh84
+               $(B.tclsh)
        $(B.tclsh) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_GEN_FLAGS) $(EXTRA_SRC)
        cp tsrc/sqlite3ext.h .
        cp $(TOP)/ext/session/sqlite3session.h .
 
-sqlite3r.h: sqlite3.h $(B.tclsh) # has_tclsh84
+sqlite3r.h: sqlite3.h $(B.tclsh)
        $(B.tclsh) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h
 
-sqlite3r.c: sqlite3.c sqlite3r.h $(B.tclsh) # has_tclsh84
+sqlite3r.c: sqlite3.c sqlite3r.h $(B.tclsh)
        cp $(TOP)/ext/recover/sqlite3recover.c tsrc/
        cp $(TOP)/ext/recover/sqlite3recover.h tsrc/
        cp $(TOP)/ext/recover/dbdata.c tsrc/
@@ -1356,11 +1356,11 @@ tcl: tclsqlite3$(T.exe)-$(HAVE_TCL)
 
 # Rules to build opcodes.c and opcodes.h
 #
-opcodes.c:     opcodes.h $(TOP)/tool/mkopcodec.tcl $(B.tclsh) # has_tclsh84
+opcodes.c:     opcodes.h $(TOP)/tool/mkopcodec.tcl $(B.tclsh)
        $(B.tclsh) $(TOP)/tool/mkopcodec.tcl opcodes.h >opcodes.c
 
 opcodes.h:     parse.h $(TOP)/src/vdbe.c \
-               $(TOP)/tool/mkopcodeh.tcl $(B.tclsh) # has_tclsh84
+               $(TOP)/tool/mkopcodeh.tcl $(B.tclsh)
        cat parse.h $(TOP)/src/vdbe.c | $(B.tclsh) $(TOP)/tool/mkopcodeh.tcl >opcodes.h
 
 # Rules to build parse.c and parse.h - the outputs of lemon.
@@ -1371,7 +1371,7 @@ parse.c:  $(TOP)/src/parse.y lemon$(B.exe)
        cp $(TOP)/src/parse.y .
        ./lemon$(B.exe) $(OPT_FEATURE_FLAGS) $(OPTS) -S parse.y
 
-sqlite3rc.h:   $(TOP)/src/sqlite3.rc $(TOP)/VERSION $(B.tclsh) # has_tclsh84
+sqlite3rc.h:   $(TOP)/src/sqlite3.rc $(TOP)/VERSION $(B.tclsh)
        echo '#ifndef SQLITE_RESOURCE_VERSION' >$@
        echo -n '#define SQLITE_RESOURCE_VERSION ' >>$@
        cat $(TOP)/VERSION | $(B.tclsh) $(TOP)/tool/replace.tcl exact . , >>$@
@@ -1385,7 +1385,7 @@ keywordhash.h:    mkkeywordhash$(B.exe)
 #
 # sqlite3.c split into many smaller files.
 #
-sqlite3-all.c: sqlite3.c $(TOP)/tool/split-sqlite3c.tcl $(B.tclsh) # has_tclsh84
+sqlite3-all.c: sqlite3.c $(TOP)/tool/split-sqlite3c.tcl $(B.tclsh)
        $(B.tclsh) $(TOP)/tool/split-sqlite3c.tcl
 
 #
@@ -1591,7 +1591,7 @@ fts5parse.c:      $(TOP)/ext/fts5/fts5parse.y lemon$(B.exe)
 
 fts5parse.h: fts5parse.c
 
-fts5.c: $(FTS5_SRC) $(B.tclsh) # has_tclsh84
+fts5.c: $(FTS5_SRC) $(B.tclsh)
        $(B.tclsh) $(TOP)/ext/fts5/tool/mkfts5c.tcl
        cp $(TOP)/ext/fts5/fts5.h .
 
@@ -1759,7 +1759,7 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl \
 #
 # sqlite3_analyzer's build mode depends on $(LINK_TOOLS_DYNAMICALLY).
 #
-sqlite3_analyzer.flags.1 = -L. -lsqlite3 $(LDFLAGS.math)
+sqlite3_analyzer.flags.1 = -L. -lsqlite3
 sqlite3_analyzer.flags.0 = $(LDFLAGS.libsqlite3)
 sqlite3_analyzer.deps.1 = $(libsqlite3.SO)
 sqlite3_analyzer.deps.0 =
@@ -1775,12 +1775,12 @@ sqlite3_analyzer$(T.exe): $(T.tcl.env.sh) sqlite3_analyzer.c \
 
 sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl \
             $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl \
-            $(TOP)/tool/sqltclsh.c.in has_tclsh85
+            $(TOP)/tool/sqltclsh.c.in
        $(B.tclsh) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
 
 sqltclsh$(T.exe): $(T.tcl.env.sh) sqltclsh.c
        $(T.link.tcl) sqltclsh.c -o $@ $$TCL_INCLUDE_SPEC $(CFLAGS.libsqlite3) \
-               $$TCL_LIB_SPEC $(LDFLAGS.libsqlite3)
+               $(LDFLAGS.libsqlite3) $$TCL_LIB_SPEC $$TCL_LIBS
 # xbin: target for generic binaries which aren't usually built. It is
 # used primarily for testing the build process.
 xbin: sqltclsh$(T.exe) sqlite3_analyzer$(T.exe)
@@ -1801,7 +1801,7 @@ CHECKER_DEPS =\
   $(TOP)/ext/misc/btreeinfo.c \
   $(TOP)/ext/repair/sqlite3_checker.c.in
 
-sqlite3_checker.c:     $(CHECKER_DEPS) has_tclsh85
+sqlite3_checker.c:     $(CHECKER_DEPS)
        $(B.tclsh) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
 
 sqlite3_checker$(T.exe):       $(T.tcl.env.sh) sqlite3_checker.c
@@ -2177,7 +2177,7 @@ SHELL_DEP = \
     $(TOP)/src/test_windirent.c \
     $(TOP)/src/test_windirent.h
 
-shell.c:       $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl $(B.tclsh) # has_tclsh84
+shell.c:       $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl $(B.tclsh)
        $(B.tclsh) $(TOP)/tool/mkshellc.tcl >shell.c
 
 #

diff --git a/manifest b/manifest
index fa0500c459c8f59ba7aaaf21ffec0498ce82473c..3c0334288c6ea652186d94aa5bac5238acbd9c60 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\smissing\s$TCL_LIBS\sto\sthe\slink\sfor\ssqlite3_analyzer.
-D 2024-11-19T21:14:48.228
+C Add\sfix\sfrom\s[bfab759611b0]\sto\ssqltclsh.\sRemove\ssome\snow-unneeded\shas_tclsh84/5\schecks\sin\scases\swhere\sjimsh\scan\sbe\sused.
+D 2024-11-19T21:19:12.706
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -696,7 +696,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 4e437d2c9cd67db9c1a0715b70e3c9f6b20f54cd97bd21b1b1a40a6181dfe874
+F main.mk 87ce967497ff2fc81406fc91c290b1faf3dfa8bb7724e3980be297381369b4f8
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2198,8 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 50b9f6fde44f9afda27e47badde6115ab6d9ccd5e22b446a8d8127499848815f
-R 550a68b5ea9d3db22b4d7e049a260626
-U drh
-Z 02a349b181e8372ee68443f7fc5c2aa7
+P bfab759611b0562837d8733ce56591854db08c122956524799dc1d5b3e2d0279
+R 0f52e38972daef31ec132c6a8f286547
+U stephan
+Z 58d6b35becabf99bb64f154abaacc201
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a1aef6a738b87a17713f2fe06daf6e4328d39021..b0f59a849755f7470d19b1e6fe131454f818a219 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bfab759611b0562837d8733ce56591854db08c122956524799dc1d5b3e2d0279
+9d389b998317c5006876f2f40d56cd763d1555bbeaf48b2bca9bd46dcd02b80e