Resolve two build FIXMEs.

FossilOrigin-Name: 4de51c165ca4d0ad66f5dd7aa16fc82c673c6791b65990339134fb26b858ec33

diff --git a/main.mk b/main.mk
index dcc87f168d82eb77511cd193d273d953940b41a5..3b401728d1443d37f62544b3fcb4e4c1975f58c6 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -1498,9 +1498,9 @@ index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.o
        $(TLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.o $(LDFLAGS_libsqlite3)
 xbin: index_usage$(TEXE)
 
+# Reminder: changeset does not build without -DSQLITE_ENABLE_SESSION
 changeset$(TEXE):      $(TOP)/ext/session/changeset.c sqlite3.o
-       @echo "FIXME: $@"; touch $@
-#      $(TLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.o $(LDFLAGS_libsqlite3)
+       $(TLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.o $(LDFLAGS_libsqlite3)
 xbin: changeset$(TEXE)
 
 changesetfuzz$(TEXE):  $(TOP)/ext/session/changesetfuzz.c sqlite3.o
@@ -1537,10 +1537,9 @@ kvtest$(TEXE):   $(TOP)/test/kvtest.c sqlite3.c
        $(TLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(LDFLAGS_libsqlite3)
 xbin: kvtest$(TEXE)
 
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.o
-       @echo "FIXME: $@"; touch $@
+#rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.o
 #      $(TLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.o $(LDFLAGS_libsqlite3)
-xbin: rbu$(EXE)
+#xbin: rbu$(EXE)
 
 loadfts$(EXE): $(TOP)/tool/loadfts.c $(libsqlite3.LIB)
        $(TLINK) $(TOP)/tool/loadfts.c $(libsqlite3.LIB) -o $@ $(LDFLAGS_libsqlite3)

diff --git a/manifest b/manifest
index f406164133409b6ce268325356fb5a34e2aa2447..69080ecc5a95d97d4501065e94e04842f9388d82 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\smost\sof\sthe\snumerous\smisc\stool\sbinaries\sbuilding.
-D 2024-10-21T21:22:18.453
+C Resolve\stwo\sbuild\sFIXMEs.
+D 2024-10-21T21:32:58.702
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -711,7 +711,7 @@ F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b5
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk f123e87f3b4dd8d508f3758cd185ec53560731918c64c9993d7358c5c86eb81d
+F main.mk a29ea875e6761a37430dd4bd9b3a7311a277b095d95f2bd9701d23a41d7623bd
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2240,8 +2240,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7bea793ce46ab5c41b242c5e69b4f9bd8536a9b106e8c39f7ac002451d5db6ea
-R 9cb9f93cb255e0456660e5d24fe32c31
+P fa74cbb40c0f2e0135ac97fc4fa899b2ab7973f925f154e8e18c85661d60e17f
+R 6a47b82222a3234924b44815565335fb
 U stephan
-Z 2b07fc524ef2b46294a607b5dc16781d
+Z 5b595eb789738b4c53b49a8868024628
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 22b1aa202fd12869d8d83932e0fc6299837450ba..0b8761020de2a2f17111e2aa880871e48ff1ffba 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fa74cbb40c0f2e0135ac97fc4fa899b2ab7973f925f154e8e18c85661d60e17f
+4de51c165ca4d0ad66f5dd7aa16fc82c673c6791b65990339134fb26b858ec33