From: stephan <stephan@noemail.net>
Date: Mon, 24 Feb 2025 07:06:36 +0000 (+0000)
Subject: Configure-internal doc tweaks. Fix the distclean rules for libsqlite3.dll.a on msys... 
X-Git-Tag: major-release~242^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=644b99641fe52f992cd8a9ca4a1f1be3d9e1de45;p=thirdparty%2Fsqlite.git

Configure-internal doc tweaks. Fix the distclean rules for libsqlite3.dll.a on msys/cygwin/mingw, broken when the DLL basename was changed for those platforms.

FossilOrigin-Name: 8641e2c7c868be67ebb367fe7c8ceeee0e0d96574c164191ce9e340e7a527f49
---

diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in
index ea0c45a3a8..f74c71d674 100644
--- a/autoconf/Makefile.in
+++ b/autoconf/Makefile.in
@@ -256,7 +256,7 @@ install: install-man1
 
 clean:
 	rm -f *.o sqlite3$(T.exe)
-	rm -f $(libsqlite3.LIB) $(libsqlite3.DLL) $(libsqlite3.DLL).a
+	rm -f $(libsqlite3.LIB) $(libsqlite3.DLL) libsqlite3$(T.dll).a
 
 distclean: clean
 	rm -f jimsh0$(T.exe) config.* sqlite3.pc sqlite_cfg.h Makefile
diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index cca6f9075b..796fd5a405 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -264,16 +264,17 @@ proc sqlite-config-bootstrap {buildMode} {
           => {Specifies the base name of the resulting DLL file, defaulting to a
               platform-depending name (libsqlite3 on most Unix-style platforms).
               If not provided, libsqlite3 is usually assumed but on some platforms
-              a platform-dependent default is used. Use "default" to explicitly
-              disable platform-dependent defaults on platforms where "auto" is
-              implicitly used if this flag is not provided.}
+              a platform-dependent default is used. On some platforms this flag
+              gets automatically enabled if it is not provided. Use "default" to
+              explicitly disable platform-dependent activation on such systems.}
         # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2
         out-implib:=auto
           => {Enable use of --out-implib linker flag to generate an
               "import library" for the DLL. The output's base name name is
               specified by the value, with "auto" meaning to figure out a
-              name automatically. Use "none" to explicitly disable the
-              feature on platforms where it is implicitly on if not provided.}
+              name automatically. On some platforms this flag gets
+              automatically enabled if it is not provided. Use "none" to
+              explicitly disable this feature on such platforms.}
       }
     }
 
@@ -283,7 +284,7 @@ proc sqlite-config-bootstrap {buildMode} {
         # Note that using the --debug/--enable-debug flag here
         # requires patching autosetup/autosetup to rename its builtin
         # --debug to --autosetup-debug. See details in
-        # autosetup/README.md.
+        # autosetup/README.md#patching.
         with-debug=0
         debug=0
           => {Enable debug build flags. This option will impact performance by
@@ -306,7 +307,9 @@ proc sqlite-config-bootstrap {buildMode} {
           => {Dynamically link libsqlite3 to certain tools which normally statically embed it}
       }
       {*} {
-        dump-defines=0       => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)}
+        dump-defines=0
+          => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt)
+              (for build debugging)}
       }
     }
   }; # $allOpts
@@ -1282,9 +1285,9 @@ proc sqlite-handle-dll-basename {} {
   }
   if {$dn in {auto ""}} {
     switch -glob -- [get-define host] {
-      *-*-cygwin* { set dn cygsqlite3-0 }
+      *-*-cygwin  { set dn cygsqlite3-0 }
       *-*-ming*   { set dn libsqlite3-0 }
-      *-*-msys*   { set dn msys-sqlite3-0 }
+      *-*-msys    { set dn msys-sqlite3-0 }
       default     { set dn libsqlite3 }
     }
   }
@@ -1355,12 +1358,13 @@ proc sqlite-env-is-unix-on-windows {{envTuple ""}} {
   if {"" eq $envTuple} {
     set envTuple [get-define host]
   }
+  set name ""
   switch -glob -- $envTuple {
-    *-*-cygwin* { return cygwin }
-    *-*-ming*   { return mingw }
-    *-*-msys*   { return msys }
+    *-*-cygwin { set name cygwin }
+    *-*-ming*  { set name mingw }
+    *-*-msys   { set name msys }
   }
-  return "";
+  return $name;
 }
 
 ########################################################################
diff --git a/main.mk b/main.mk
index e83f354de7..7cbd88bfac 100644
--- a/main.mk
+++ b/main.mk
@@ -2381,7 +2381,7 @@ tidy: tidy-.
 	rm -f lemon$(B.exe) sqlite*.tar.gz
 	rm -f mkkeywordhash$(B.exe) mksourceid$(B.exe)
 	rm -f parse.* fts5parse.*
-	rm -f $(libsqlite3.DLL) $(libsqlite3.LIB) $(libtclsqlite3.SO) $(libsqlite3.DLL).a
+	rm -f $(libsqlite3.DLL) $(libsqlite3.LIB) $(libtclsqlite3.SO) libsqlite3$(T.dll).a
 	rm -f tclsqlite3$(T.exe) $(TESTPROGS)
 	rm -f LogEst$(T.exe) fts3view$(T.exe) rollback-test$(T.exe) showdb$(T.exe)
 	rm -f showjournal$(T.exe) showstat4$(T.exe) showwal$(T.exe) speedtest1$(T.exe)
diff --git a/manifest b/manifest
index 9af16dd0e4..f840036d3b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssome\sinternal\snotes\sabout\spotential\schanges\sfor\sthe\srpath\sflag\shandling.
-D 2025-02-24T05:10:09.506
+C Configure-internal\sdoc\stweaks.\sFix\sthe\sdistclean\srules\sfor\slibsqlite3.dll.a\son\smsys/cygwin/mingw,\sbroken\swhen\sthe\sDLL\sbasename\swas\schanged\sfor\sthose\splatforms.
+D 2025-02-24T07:06:36.064
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
 F auto.def 37cd272e5a2179b4ae99511a0c70e724b24720ccb69e8238d800b52106537782
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
-F autoconf/Makefile.in d4bc4b3e0680c9f9cd8633279e597abb5f29fa58f29950e49dbf359e1c553720
+F autoconf/Makefile.in c9a7007181df2a07d08bd63c6ba395ed38705aa218789726951aabebec32ee27
 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl cc300c15633cb2835eb52c235c5abfd2de0e8e989e9b650e82df3c1d3b856d22
-F autosetup/sqlite-config.tcl 3e6815229a2e43d0ceb35c051ccdb7888feacc6ff94ed9da9dca1d81494ca105
+F autosetup/sqlite-config.tcl e55569f6ab09a19af7b89c71c20b77b13c8594c9dd6ef2b4463611b8ee76b927
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -705,7 +705,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 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 2c93ed0030ef1a3ac2c7e40d619ae46771556b396bf5f9b0abac445a8026b3cb
+F main.mk 47722beae213a94638819c60c3c560ab4d61f93dcb760980df4cdb105e383089
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2210,8 +2210,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 ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56
-R eeeefd36d893cc55dc27e27479712352
+P 6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987
+R cf9fc5d44286845f3980ae6c5b3ec3e6
 U stephan
-Z 2cdb20385f544083be489e48d188981f
+Z 5fd2d1e9c016bedf0db0ccd156948622
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bca7853b2c..1632237ee3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987
+8641e2c7c868be67ebb367fe7c8ceeee0e0d96574c164191ce9e340e7a527f49