From 97056a2a21dc3ef2a02d30427f6573cf0a33a34f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 7 Feb 2025 12:59:03 +0000
Subject: [PATCH] configure: change extension of static libraries from .lib to
 .a on msys/cygwin, as per discussion in [forum:02db2d4240|forum post
 02db2d4240]. Replace unidiomatic JS-style use of inner procs in
 autosetup/proj.tcl with TCL lambdas.

FossilOrigin-Name: b7c84c04a4eb0575a44edc0abd5ea2bbe4dd07ab6241533fababeca6326f8159
---
 autosetup/proj.tcl | 20 +++++++++++---------
 manifest           | 14 +++++++-------
 manifest.uuid      |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index 88da2112cf..5eeec0afb9 100644
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -760,7 +760,7 @@ proc proj-exe-extension {} {
 # Trivia: for .dylib files, the linker needs the -dynamiclib flag
 # instead of -shared.
 proc proj-dll-extension {} {
-  proc inner {key} {
+  set inner {{key} {
     switch -glob -- [get-define $key] {
       *apple* {
         return ".dylib"
@@ -772,9 +772,9 @@ proc proj-dll-extension {} {
         return ".so"
       }
     }
-  }
-  define BUILD_DLLEXT [inner build]
-  define TARGET_DLLEXT [inner host]
+  }}
+  define BUILD_DLLEXT [apply $inner build]
+  define TARGET_DLLEXT [apply $inner host]
 }
 
 ########################################################################
@@ -784,18 +784,20 @@ proc proj-dll-extension {} {
 # BUILD_LIBEXT and TARGET_LIBEXT to the conventional static library
 # extension for the being-built-on resp. the target platform.
 proc proj-lib-extension {} {
-  proc inner {key} {
+  set inner {{key} {
     switch -glob -- [get-define $key] {
       *-*-ming* - *-*-cygwin - *-*-msys {
-        return ".lib"
+        return ".a"
+        # ^^^ this was ".lib" until 2025-02-07. See
+        # https://sqlite.org/forum/forumpost/02db2d4240
       }
       default {
         return ".a"
       }
     }
-  }
-  define BUILD_LIBEXT [inner build]
-  define TARGET_LIBEXT [inner host]
+  }}
+  define BUILD_LIBEXT [apply $inner build]
+  define TARGET_LIBEXT [apply $inner host]
 }
 
 ########################################################################
diff --git a/manifest b/manifest
index fa5c7ec1a6..93a819039f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reorder\sa\spiece\sof\sext/wasm/GNUmakefile\sto\scorrect\sthe\stiming\sof\svarious\svar\saccesses.\sFixes\sa\sproblem\s[https://github.com/sqlite/sqlite-wasm/pull/99|reported\sin\sthe\sdownstream\snpm\ssubproject]\sand\sexplains\sthe\sconfusion\sin\s[4aa025a943a4024094b9]\s(which\shas\sbeen\sreverted).
-D 2025-02-07T12:36:25.715
+C configure:\schange\sextension\sof\sstatic\slibraries\sfrom\s.lib\sto\s.a\son\smsys/cygwin,\sas\sper\sdiscussion\sin\s[forum:02db2d4240|forum\spost\s02db2d4240].\sReplace\sunidiomatic\sJS-style\suse\sof\sinner\sprocs\sin\sautosetup/proj.tcl\swith\sTCL\slambdas.
+D 2025-02-07T12:59:03.269
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -49,7 +49,7 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d
 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f
 F autosetup/jimsh0.c 5a74bdbf43c52289e3f482f3b9578db4bd657e88e8fe04b16c564d9fb710540a
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl 9adf1539673cef15bff862d9360b479e6920cc2c0d85de707b0ba31c04ce4531
+F autosetup/proj.tcl af5290ee128ce82dd178a474a9dcfaa7e503c88f0709d916cc6079d9b8c801f4
 F autosetup/sqlite-config.tcl 00af5b9d94d580367bf01984b86397e8d35b74090427def9591a54ded0e1a287
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
@@ -2209,9 +2209,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 37dbacde3e18bb1984e301302118a6879006356fafc95882373feacbd5768cb9
-Q +65798c09a00662a3598f01571d6f3a2dc750c3d0b127c344590539244afe4aa7
-R 90e3002aeb96ea5f98ad16a80c92e0ad
+P de3d2e4caa8a645847a4ceb2c82f2f6ad485e16d8970316335fec041601b588b
+Q +46f51e2a3707614a2b3ca6261bc6e0e8835477fdb7cbcf2f06b20cdebde2bab9
+R b7b424424e557834abe23485d240383a
 U stephan
-Z 85a7148376c1d38f9484c34b3939a736
+Z 8e337d0399b75bbbcb5094001bfa01e7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e9b5401605..f87792037c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-de3d2e4caa8a645847a4ceb2c82f2f6ad485e16d8970316335fec041601b588b
+b7c84c04a4eb0575a44edc0abd5ea2bbe4dd07ab6241533fababeca6326f8159
-- 
2.47.2