From: stephan <stephan@noemail.net>
Date: Sun, 23 Feb 2025 15:34:05 +0000 (+0000)
Subject: Internal configure doc cleanups. Apply the [5ecbe7ddc4] unix-on-windows DLL install... 
X-Git-Tag: major-release~242^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43aeed3fec8f1c81f644d6ebe3f6934ff53ffab7;p=thirdparty%2Fsqlite.git

Internal configure doc cleanups. Apply the [5ecbe7ddc4] unix-on-windows DLL install dir fix to the canonical build.

FossilOrigin-Name: 51b9812df9087ec0aa7656178a069ddf2d60dcffa5ab0de57a84bd412b2f71c7
---

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index 52b410fd6a..edd1b03351 100644
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -1166,7 +1166,7 @@ proc proj-xfer-options-aliases {mapping} {
 ########################################################################
 # Arguable/debatable...
 #
-# When _not_ cross-compiling and CC_FOR_BUILD is _not_ explcitely
+# When _not_ cross-compiling and CC_FOR_BUILD is _not_ explicitly
 # specified, force CC_FOR_BUILD to be the same as CC, so that:
 #
 # ./configure CC=clang
diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 003c567ca6..e2e99ef234 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -1314,7 +1314,6 @@ proc sqlite-handle-dll-basename {} {
 # - msys2 packages historically install /usr/lib/libsqlite3.dll.a
 #   despite the DLL being in /usr/bin/msys-sqlite3-0.dll.
 proc sqlite-handle-out-implib {} {
-  sqlite-handle-dll-basename
   define LDFLAGS_OUT_IMPLIB ""
   define SQLITE_OUT_IMPLIB ""
   set rc 0
@@ -1367,10 +1366,10 @@ proc sqlite-env-is-unix-on-windows {{envTuple ""}} {
 # certain platforms, e.g. Mac and "Unix on Windows" platforms (msys2,
 # cygwin, ...).
 #
-# DLL installation:
+# 1) DLL installation:
 #
-# [define]s SQLITE_DLL_INSTALL_RULES to a symbolic name of a set of
-# "make install" rules to use for installation of the DLL
+# [define]s SQLITE_DLL_INSTALL_RULES to a symbolic name suffix for a
+# set of "make install" rules to use for installation of the DLL
 # deliverable. The makefile is tasked with with providing rules named
 # install-dll-NAME which runs the installation for that set, as well
 # as providing a rule named install-dll which resolves to
@@ -1379,12 +1378,14 @@ proc sqlite-env-is-unix-on-windows {{envTuple ""}} {
 #
 # The default value is "unix-generic".
 #
-# --out-implib:
+# 2) --out-implib:
 #
 # On platforms where an "import library" is conventionally used but
 # --out-implib was not explicitly used, automatically add that flag.
+# This conventionally applies to the "Unix on Windows" environments
+# like msys and cygwin.
 #
-# --dll-basename:
+# 3) --dll-basename:
 #
 # On the same platforms addressed by --out-implib, if --dll-basename
 # is not specified, --dll-basename=auto is implied.
@@ -1408,7 +1409,7 @@ proc sqlite-handle-env-quirks {} {
     if {![proj-opt-was-provided out-implib]} {
       # Imply --out-implib=auto
       proj-indented-notice [subst -nocommands -nobackslashes {
-        NOTICE: auto-enabling --out-implib for $host.
+        NOTICE: auto-enabling --out-implib for environment [$host].
         Use --out-implib=none to disable this special case
         or --out-implib=auto to squelch this notice.
       }]
@@ -1417,13 +1418,14 @@ proc sqlite-handle-env-quirks {} {
     if {![proj-opt-was-provided dll-basename]} {
       # Imply --dll-basename=auto
       proj-indented-notice [subst -nocommands -nobackslashes {
-        NOTICE: auto-enabling --dll-basename for $host.
+        NOTICE: auto-enabling --dll-basename for environment [$host].
         Use --dll-basename=default to disable this special case
         or --dll-basename=auto to squelch this notice.
       }]
       proj-opt-set dll-basename auto
     }
   }
+  sqlite-handle-dll-basename
   sqlite-handle-out-implib
   sqlite-handle-mac-cversion
 }
@@ -1696,9 +1698,9 @@ proc sqlite-check-tcl {} {
         proj-fatal "No tclConfig.sh found under ${with_tcl}"
       }
     } else {
-      # If we have not yet found a tclConfig.sh file, look in
-      # $libdir which is set automatically by autosetup or by the
-      # --prefix command-line option.  See
+      # If we have not yet found a tclConfig.sh file, look in $libdir
+      # which is set automatically by autosetup or via the --prefix
+      # command-line option.  See
       # https://sqlite.org/forum/forumpost/e04e693439a22457
       set libdir [get-define libdir]
       if {[file readable "${libdir}/tclConfig.sh"]} {
@@ -1884,7 +1886,7 @@ proc sqlite-determine-codegen-tcl {} {
       }
       define BTCLSH "\$(TCLSH_CMD)"
     }
-  }; # CC swap-out
+  }; # /define-push $flagsToRestore
   return $cgtcl
 }; # sqlite-determine-codegen-tcl
 
diff --git a/main.mk b/main.mk
index 007061e0ad..839d29af9e 100644
--- a/main.mk
+++ b/main.mk
@@ -1452,6 +1452,8 @@ $(libsqlite3.DLL)-0 $(libsqlite3.DLL)-:
 so: $(libsqlite3.DLL)-$(ENABLE_LIB_SHARED)
 all: so
 
+#
+# DLL installation...
 #
 # On most Unix-like platforms, install the $(libsqlite3.DLL) as
 # $(libsqlite3.DLL).$(PACKAGE_VERSION) and create symlinks which point
@@ -1461,9 +1463,8 @@ all: so
 # - libsqlite3.so.0      =symlink-> libsqlite3.so.$(PACKAGE_VERSION) (see below)
 # - libsqlite3.so        =symlink-> libsqlite3.so.3
 #
-# The symlinks are not added on platforms where $(T.dll) is ".dll",
-# and different transformations take place on platforms where $(T.dll)
-# is ".dylib".
+# Different rules apply for platforms where $(T.dll)==.dylib and for
+# the "Unix on Windows" environments.
 #
 # The link named libsqlite3.so.0 is provided in an attempt to reduce
 # downstream disruption when performing upgrades from pre-3.48 to a
@@ -1526,7 +1527,7 @@ install-dll-unix-generic: install-dll-out-implib
 		ls -la $(libsqlite3.DLL).0.8.6; \
 	fi
 
-install-dll-msys: install-dll-out-implib
+install-dll-msys: install-dll-out-implib $(install-dir.bin)
 	$(INSTALL) $(libsqlite3.DLL) "$(install-dir.bin)"
 # ----------------------------------------------^^^ yes, bin
 install-dll-mingw:  install-dll-msys
diff --git a/manifest b/manifest
index 02ed307402..e96c6d43b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\shelp\stext\sto\saccount\sfor\s[35b1c32f80b9].
-D 2025-02-22T17:33:18.554
+C Internal\sconfigure\sdoc\scleanups.\sApply\sthe\s[5ecbe7ddc4]\sunix-on-windows\sDLL\sinstall\sdir\sfix\sto\sthe\scanonical\sbuild.
+D 2025-02-23T15:34:05.604
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d
 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f
 F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl 04fd2d110b6464f7a2847380a39bed647c2646a868a4ed60f7a625e52a9a8b20
-F autosetup/sqlite-config.tcl 8cd7b6963d2d6561595389171c4d7495b61095706df9ad80e677c9920da10680
+F autosetup/proj.tcl 9b5d7b984cbbbdcc5388a80cd3f8149c79fe135a69f6ef067dbce5cae6edcc77
+F autosetup/sqlite-config.tcl caf7f974d69b90fd6d53f6ffaae4fb468e9f44d4b23764fd8245b9ba36f64bb9
 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 adfc8d55db64c8dd3e89c74611c2f8be15b204b68338133763df8eb8d7faa344
+F main.mk 4be69e88cfe2fb9091a07ad5debaaac7bf15fcbd373ade62146440606aa42344
 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 35b1c32f80b9aed04776508683a1828fd5777ee8bb0e42e593557ae3cca558e4
-R 44a6434da0b2aec6a0e3c6807bb35211
+P f2e7355d87450f9a4d98390cf9d830e9902105048f9308e02c597190ecf2a594
+R fffbf6acb18ecfeac90b7b2e01746be5
 U stephan
-Z e1feccfa91581cfed3261c34760f8a9d
+Z 91c7527af047fb17603dad8a953d6c86
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 27fbc1ee3e..4d0f7f6be2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f2e7355d87450f9a4d98390cf9d830e9902105048f9308e02c597190ecf2a594
+51b9812df9087ec0aa7656178a069ddf2d60dcffa5ab0de57a84bd412b2f71c7