Remove some proj-assert checks which are not valid on OpenBSD. Ensure that queued...

FossilOrigin-Name: 3447308f3f66046ffedd502161757211bef0384d7a735ff675c06c04fbc22655

diff --git a/auto.def b/auto.def
index 34e70dfcfc5577c6345b52b1c3e6d5ec787641a1..0696cb53a8c24c2bc7d27b72593c666e3a56a66c 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -568,15 +568,13 @@ proc sqlite-check-tcl {} {
     }
     break
   }
-
   define TCL_CONFIG_SH $cfg
   # Export a subset of tclConfig.sh to the current TCL-space.  If the
   # config is not available, this emits empty-string entries for the
   # various options we're interested in.
   eval [exec "${top_srcdir}/tool/tclConfigShToTcl.sh" "$cfg"]
 
-  if {"" eq $with_tclsh} {
-    proj-assert {expr {$cfg ne ""}}
+  if {"" eq $with_tclsh && $cfg ne ""} {
     proj-assert {expr {"" ne [get-define TCL_EXEC_PREFIX]}}
     set with_tclsh [get-define TCL_EXEC_PREFIX]/bin/tclsh[get-define TCL_VERSION]
     if {![file-isexec $with_tclsh]} {
@@ -589,8 +587,6 @@ proc sqlite-check-tcl {} {
     }
   }
   define TCLSH_CMD $with_tclsh
-  proj-assert {expr {( $cfg eq "" && 0 == $use_tcl ) \
-                       || ( $cfg ne "" && 1 == $use_tcl )}}
   if {$use_tcl} {
     # Set up the TCLLIBDIR and TCLLIB_RPATH
     #
@@ -638,6 +634,7 @@ proc sqlite-check-tcl {} {
   } else {
     proj-warn "Cannot find a usable tclsh, so cannot run tests."
   }
+  show-notices
 }; # sqlite-check-tcl
 
 sqlite-check-tcl

diff --git a/manifest b/manifest
index f108e50998d8ae85ed8b338ac23bbd013d2c8518..2d9380d7675f5c1a1212f5fe298f89594dc3efce 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sreading\sin\s.default-CFLAGS,\strim\sit.
-D 2024-10-31T07:30:53.399
+C Remove\ssome\sproj-assert\schecks\swhich\sare\snot\svalid\son\sOpenBSD.\sEnsure\sthat\squeued\sup\snotices\sabout\sTCL\swarnings\sare\sdisplayed\sbefore\sleaving\ssqlite-check-tcl.
+D 2024-10-31T08:03:35.227
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@ -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 9b43af60e0ac708da9a84d489820eca5899a894d53420b339d12cfcc411620c1
+F auto.def 4df2b29cfabce9e64992b557e58e6b69405c58d2dcac071b70e0ddbad24a3c11
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -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 2c615d3a3206536f12c0723b8997bda9ab61f95a468f77697856213b46c0135e
-R 21c04bd2c5dfb28bd50b344cb95ee239
+P a62a5171ace53b79feda93701f90d6d6f88eb5542bd35ac76f962745c58588b0
+R 541059fa6d4b4792ae313ac1b77e951c
 U stephan
-Z 48bef13d8f51175654cd176b9ca6952d
+Z 68b7c1ee23dc2d6c759433af0943e546
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 5340bb49d00127d9d27aae45e08051852e31cbbf..b2a4dafcd6765e06928e19db11170a45d6d44d33 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a62a5171ace53b79feda93701f90d6d6f88eb5542bd35ac76f962745c58588b0
+3447308f3f66046ffedd502161757211bef0384d7a735ff675c06c04fbc22655