Remove some resolved TODOs from the makefile. Ensure that testfixture links against...

FossilOrigin-Name: b7751d144330593b5d41cb50e44b5134baad722be65173a7f55887f5e86a8c9d

diff --git a/Makefile.in b/Makefile.in
index d462d811edc9d3d9ad5afe42abb9e2e387638497..ef10da7a3280c55a23c5ba09174f75ca88cd1596 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,13 +15,6 @@ all:
 # Known TODOs/FIXMEs/TOIMPROVEs for the autosetup port, in no
 # particular order...
 #
-# - TEA pieces.
-#
-# - Replace the autotools-specific distribution deliverable(s).
-#
-# - Confirm whether cross-compilation works and patch it
-# appropriately.
-#
 # Maintenance reminders:
 #
 # - This makefile should remain as POSIX-make-compatible as possible:

diff --git a/main.mk b/main.mk
index b30c220bdfccdda094833a0d425c02c741764793..f817924feaca60ca2c2f9af25dbe3bc8f2011545 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -1801,7 +1801,7 @@ TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
 testfixture$(T.exe):   $(T.tcl.env.sh) has_tclsh85 $(TESTFIXTURE_SRC)
        $(T.link.tcl) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \
                -o $@ $(TESTFIXTURE_SRC) \
-               $$TCL_LIB_SPEC $$TCL_INCLUDE_SPEC \
+               $$TCL_LIB_SPEC $$TCL_INCLUDE_SPEC $$TCL_LIBS \
                $(LDFLAGS.libsqlite3)
 
 coretestprogs: testfixture$(B.exe) sqlite3$(B.exe)

diff --git a/manifest b/manifest
index f755cca50e001831c2b5933ce33e85a8362a0c50..7c0f96525d4bb3cb287d4e7c12c1fb847d7a4a29 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C The\ssqlite3_prepare()\sand\ssimilar\sinterfaces\sshould\snot\sreturn\nSQLITE_ERROR_RETRY.\n[forum:/forumpost/aa61ab56adb56159|Forum\spost\saa61ab56].
-D 2025-08-20T23:29:59.824
+C Remove\ssome\sresolved\sTODOs\sfrom\sthe\smakefile.\sEnsure\sthat\stestfixture\slinks\sagainst\sTCL_LIBS.
+D 2025-08-21T17:39:44.181
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
-F Makefile.in a6c14b6906f5322920dd5d1ff9a84808337911068f2a6e777ec7088a87cbc3a8
+F Makefile.in fe6bed3183c8fa49476cb66c9895100bcbbb59681b5f72dbb47f1c8ea440fd93
 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
 F Makefile.msc b87ac9041d87f61fabd6074e6d8b71dd7f78c884a2307bbb9301f9d436ce9242
 F README.md e28077cfbef795e99c9c75ed95aa7257a1166709b562076441a8506ac421b7c1
@@ -665,7 +665,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36
 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61
 F ext/wasm/wasmfs.make 411dd94b40406572caddf88392a1ccc4deed0f88d260516e59ca6e0c887ee861
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk d83e31f37ba77f7a5398d96629a486b3f6b8c9cc5417f92a2e55f3857324894e
+F main.mk 04ca5a9737fdf10ca00bb3a8f9c04e966c058730bf25c617c141877afb016d46
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2169,9 +2169,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 138e2aab43ac07aaf8c5389105ff6d3e107ff2d35badcb48233664fcb9661471 6c6a8a596f5d578cc7d35c577608492c0314cdb84ed67b9f068d90fb0b42f4de
-R eb37a0986f5d255163eb25dcab448a8c
-T +closed 6c6a8a596f5d578cc7d35c577608492c0314cdb84ed67b9f068d90fb0b42f4de
-U drh
-Z 2870079f01c386ed9c746ff2b4138080
+P 4e473cf0c21dd78d457f5728086372464e82de95c5431a2587efd580f5076291
+R 0466857e280658b283850635040c4085
+U stephan
+Z 72805da7d58402f56ee1e19fad798bf6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4f6369f63bba211a594b086f758679b06959ec21..fe11111a5527cde07a55d6f8e43fcb682f552fa9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e473cf0c21dd78d457f5728086372464e82de95c5431a2587efd580f5076291
+b7751d144330593b5d41cb50e44b5134baad722be65173a7f55887f5e86a8c9d