From: stephan <stephan@noemail.net>
Date: Thu, 28 Aug 2025 15:04:52 +0000 (+0000)
Subject: Remove sqlite3expert.h from the compiler invocation for that tool, as it (A) doesn... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dca1f04f0775cce80bcd6831acd9fa69bdfb40f2;p=thirdparty%2Fsqlite.git

Remove sqlite3expert.h from the compiler invocation for that tool, as it (A) doesn't need to be there and (B) it causes some compilers problems (as reported in [forum:a1085109e7db4cf3 | forum post a1085109e7]). This bug was faithfully carried over from the legacy build.

FossilOrigin-Name: 9f0a16f6e893d51f760a8c1e2cb4709fdd16ccb2c0258695767f8305f407f4ac
---

diff --git a/main.mk b/main.mk
index f817924fea..6304a0ad30 100644
--- a/main.mk
+++ b/main.mk
@@ -1963,7 +1963,7 @@ xbin: sqltclsh$(T.exe) sqlite3_analyzer$(T.exe)
 
 sqlite3_expert$(T.exe): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c \
                        $(TOP)/ext/expert/expert.c sqlite3.c
-	$(T.link) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c \
+	$(T.link) $(TOP)/ext/expert/sqlite3expert.c \
 		$(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(LDFLAGS.libsqlite3)
 xbin: sqlite3_expert$(T.exe)
 
diff --git a/manifest b/manifest
index 50d64c9045..de6c0f5280 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\sto\sensure\sthat\schanging\sthe\snumber\sof\sreserved\sbytes\sin\sa\sdatabase\susing\sVACUUM\sdoes\snot\sconfuse\sother\sconnections\sin\sstock\sSQLite.
-D 2025-08-27T11:21:44.274
+C Remove\ssqlite3expert.h\sfrom\sthe\scompiler\sinvocation\sfor\sthat\stool,\sas\sit\s(A)\sdoesn't\sneed\sto\sbe\sthere\sand\s(B)\sit\scauses\ssome\scompilers\sproblems\s(as\sreported\sin\s[forum:a1085109e7db4cf3\s|\sforum\spost\sa1085109e7]).\sThis\sbug\swas\sfaithfully\scarried\sover\sfrom\sthe\slegacy\sbuild.
+D 2025-08-28T15:04:52.123
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -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 04ca5a9737fdf10ca00bb3a8f9c04e966c058730bf25c617c141877afb016d46
+F main.mk d865589aa95918787659459f7dddd0680f99034e7b111fc161035d736c670a47
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2171,8 +2171,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 d2a74d5c36f600fa8d7dc03f6914482a2afca6e4ff557a0007d14f4304645ba1
-R 6a78a2f416b052365db58a75e4ea3e3c
-U dan
-Z a9cef546beee29297752d3d77982bd8f
+P 6bf54bbc4d503e8ebeb804dfb318383770e85d434dacbbbd8f6dadc7595b1856
+R 905e8c152c3222011372dd2a87fab2fc
+U stephan
+Z 77f17eb3321ce5aa5d622e6b5493bd5d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index adbba0db47..431059d882 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6bf54bbc4d503e8ebeb804dfb318383770e85d434dacbbbd8f6dadc7595b1856
+9f0a16f6e893d51f760a8c1e2cb4709fdd16ccb2c0258695767f8305f407f4ac