From: stephan <stephan@noemail.net>
Date: Thu, 7 Nov 2024 08:57:38 +0000 (+0000)
Subject: Add some internal docs to auto.def explaining certain passages.
X-Git-Tag: major-relase~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c3139d7eeda28cc7e566388f2a2098d9450aa30;p=thirdparty%2Fsqlite.git

Add some internal docs to auto.def explaining certain passages.

FossilOrigin-Name: 4749967e1b85675580eda2e92f4463c022e3ff929390a8f5b59f614f3975e158
---

diff --git a/auto.def b/auto.def
index 4d530d7429..87a9670cae 100644
--- a/auto.def
+++ b/auto.def
@@ -635,8 +635,8 @@ proc sqlite-check-tcl {} {
   }; # find TCLLIBDIR
 
   if {[file-isexec $with_tclsh]} {
+    msg-result "Using tclsh: $with_tclsh"
     if {$cfg ne ""} {
-      msg-result "Using tclsh: $with_tclsh"
       define HAVE_TCL 1
     } else {
       proj-warn "Found tclsh but no tclConfig.sh, so cannot build TCL components."
@@ -672,7 +672,7 @@ proc sqlite-determine-codegen-tcl {} {
   msg-result "Checking for TCL to use for code generation... "
   define CFLAGS_JIMSH [proj-get-env CFLAGS_JIMSH {-O1}]
   set cgtcl [opt-val with-tclsh jimsh]
-  set flagsToRestore {CC CFLAGS CPPFLAGS LDFLAGS LINKFLAGS LIBS CROSS}
+  set flagsToRestore {CC CFLAGS AS_CFLAGS CPPFLAGS AS_CPPFLAGS LDFLAGS LINKFLAGS LIBS CROSS}
   define-push $flagsToRestore {
     # We have to swap CC to CC_FOR_BUILD for purposes of the various
     # [cc-...] tests below. Recall that --with-wasi-sdk may have
@@ -680,6 +680,9 @@ proc sqlite-determine-codegen-tcl {} {
     # Per consulation with autosetup's creator, doing this properly
     # requires us to [define-push] the whole $flagsToRestore list
     # (plus a few others which are not relevant in this tree).
+    #
+    # These will get set to their previous values at the end of this
+    # block.
     foreach flag $flagsToRestore {define $flag ""}
     define CC [get-define CC_FOR_BUILD]
     if {"jimsh" ne $cgtcl} {
@@ -690,12 +693,22 @@ proc sqlite-determine-codegen-tcl {} {
       # These headers are technically optional for JimTCL but necessary if
       # we want to use it for code generation:
       set sysh [cc-check-includes dirent.h sys/time.h]
+      # jimsh0.c hard-codes #define's for HAVE_DIRENT_H and
+      # HAVE_SYS_TIME_H on the platforms it supports, so we do not
+      # need to add -D... flags for those. We check for them here only
+      # so that we can avoid the situation that we later, at
+      # make-time, try to compile jimsh but it then fails due to
+      # missing headers (i.e. fail earlier rather than later).
       if {$sysh && [cc-check-functions realpath]} {
         define-append CFLAGS_JIMSH -DHAVE_REALPATH
         define BTCLSH "\$(JIMSH)"
         set ::useJimForCodeGen 1
       } elseif {$sysh && [cc-check-functions _fullpath]} {
-        # _fullpath() is a Windows API
+        # _fullpath() is a Windows API. It's not entirely clear
+        # whether we need to add {-DHAVE_SYS_TIME_H -DHAVE_DIRENT_H}
+        # to CFLAGS_JIMSH in this case. On MinGW32 we definitely do
+        # not want to because it already hard-codes them. On _MSC_VER
+        # builds it does not.
         define-append CFLAGS_JIMSH -DHAVE__FULLPATH
         define BTCLSH "\$(JIMSH)"
         set ::useJimForCodeGen 1
diff --git a/manifest b/manifest
index a555167b72..94016ad484 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Document\sthe\spurpose\sof\sa\sglobal\sauto.def\svar\sadded\sin\s[0d558318172d].
-D 2024-11-07T08:29:58.913
+C Add\ssome\sinternal\sdocs\sto\sauto.def\sexplaining\scertain\spassages.
+D 2024-11-07T08:57:38.576
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -13,7 +13,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
-F auto.def 98bba5513da76ef172c6d9bc9225bb42da8a33e8d6c15a5992061fd8fa1e4a1b
+F auto.def 8d10658f2d06b0a8ddd558dfff3c111fc2b01b81d88a1bd059544abcf6e3f453
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2200,8 +2200,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 0d558318172dddc8d5c5842625ddf09866ae09cac9cf28731be44db86b5e0fb1
-R 5d6ca70a882e670f62252acdee03d8e1
+P f5b6604716826b2057e969a8c0d099325b22eac42f1da65ec367671fc6625639
+R e6f5780ae9a523afdaecc8222f6bc4aa
 U stephan
-Z 8d1397a1cc0f102a32067d207ce6cbe0
+Z ffd0c5323b1c2405e83633da2cf2458a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9300dfb3d2..46b7fa9517 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f5b6604716826b2057e969a8c0d099325b22eac42f1da65ec367671fc6625639
+4749967e1b85675580eda2e92f4463c022e3ff929390a8f5b59f614f3975e158