From: drh <> Date: Tue, 19 Nov 2024 21:14:48 +0000 (+0000) Subject: Add missing $TCL_LIBS to the link for sqlite3_analyzer. X-Git-Tag: major-relase~130^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18c9e2638eed17bb3ed35581d0054c7404e56f33;p=thirdparty%2Fsqlite.git Add missing $TCL_LIBS to the link for sqlite3_analyzer. FossilOrigin-Name: bfab759611b0562837d8733ce56591854db08c122956524799dc1d5b3e2d0279 --- diff --git a/main.mk b/main.mk index f1c36b3575..144c1e2b58 100644 --- a/main.mk +++ b/main.mk @@ -1767,7 +1767,7 @@ sqlite3_analyzer$(T.exe): $(T.tcl.env.sh) sqlite3_analyzer.c \ $(sqlite3_analyzer.deps.$(LINK_TOOLS_DYNAMICALLY)) $(T.link.tcl) sqlite3_analyzer.c -o $@ \ $(sqlite3_analyzer.flags.$(LINK_TOOLS_DYNAMICALLY)) \ - $$TCL_LIB_SPEC $$TCL_INCLUDE_SPEC + $$TCL_LIB_SPEC $$TCL_INCLUDE_SPEC $$TCL_LIBS # ^^^^ the order of those flags is relevant for # $(sqlite3_analyzer.flags.1): if the $$TCL_... flags come first they # can cause the $@ to link to an out-of-tree libsqlite3.so, which may diff --git a/manifest b/manifest index 52a4d101ec..fa0500c459 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Rename\s--link-tools-dynamically\sto\s--dynlink-tools,\sper\sdiscussion. -D 2024-11-19T20:21:40.498 +C Add\smissing\s$TCL_LIBS\sto\sthe\slink\sfor\ssqlite3_analyzer. +D 2024-11-19T21:14:48.228 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 de4824958a997377f0b661329699eb0b58e81c3076d68bf45898305d074fd3ee +F main.mk 4e437d2c9cd67db9c1a0715b70e3c9f6b20f54cd97bd21b1b1a40a6181dfe874 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 c938e5d783b3f015b2a1b9f3711664b13497c4b71e4a890c65d6665539522ff8 -R 2438fd2896d39f35fc299b3fd744f13f -U stephan -Z e384122113bfcbb2fa4bae830787db35 +P 50b9f6fde44f9afda27e47badde6115ab6d9ccd5e22b446a8d8127499848815f +R 550a68b5ea9d3db22b4d7e049a260626 +U drh +Z 02a349b181e8372ee68443f7fc5c2aa7 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ae727ec259..a1aef6a738 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -50b9f6fde44f9afda27e47badde6115ab6d9ccd5e22b446a8d8127499848815f +bfab759611b0562837d8733ce56591854db08c122956524799dc1d5b3e2d0279