From: stephan <stephan@noemail.net>
Date: Fri, 14 Feb 2025 17:21:05 +0000 (+0000)
Subject: Work around a autosetup --help bug which only(?) triggers on tcl 8.6, introduced... 
X-Git-Tag: major-release~285
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a09fd7b91330616b1ec31546c21550449b184661;p=thirdparty%2Fsqlite.git

Work around a autosetup --help bug which only(?) triggers on tcl 8.6, introduced by [9978c87139b7b042] and reported upstream as [https://github.com/msteveb/autosetup/issues/73|ticket #73]. Summary: calling 'options' from a proc, instead of the global scope, triggers an error about an invalid use of 'break'.

FossilOrigin-Name: 6a21d6a2ed627ba0a864bef85369ed17553b808ae5c19891fa1f70505dfcbe39
---

diff --git a/auto.def b/auto.def
index 4528293cd7..455b246e09 100644
--- a/auto.def
+++ b/auto.def
@@ -14,8 +14,14 @@
 #
 
 use sqlite-config
-sqlite-config-bootstrap canonical
-
+if {0} {
+  sqlite-config-bootstrap canonical
+} else {
+  set sq3options [sqlite-config-bootstrap canonical]
+  options $sq3options
+  unset sq3options
+  sqlite-post-options-init
+}
 sqlite-setup-default-cflags
 proj-if-opt-truthy dev {
   # --enable-dev needs to come early so that the downstream tests
diff --git a/autoconf/auto.def b/autoconf/auto.def
index bb8710378f..7e154caa32 100644
--- a/autoconf/auto.def
+++ b/autoconf/auto.def
@@ -8,7 +8,14 @@
 # included in this source tree as ./autosetup/jimsh0.c.
 #
 use sqlite-config
-sqlite-config-bootstrap autoconf
+if {0} {
+  sqlite-config-bootstrap autoconf
+} else {
+  set sq3options [sqlite-config-bootstrap autoconf]
+  options $sq3options
+  unset sq3options
+  sqlite-post-options-init
+}
 sqlite-check-common-bins
 sqlite-check-common-system-deps
 proj-check-rpath
diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 1616b10920..338eb2408b 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -295,9 +295,14 @@ proc sqlite-config-bootstrap {buildMode} {
       }
     }
   }
-  #puts "options = $opts"; exit 0
-  options $opts
-  sqlite-post-options-init
+  if {0} {
+    #puts "options = $opts"; exit 0
+    options $opts
+    sqlite-post-options-init
+  } else {
+    # Workaround for https://github.com/msteveb/autosetup/issues/73
+    return $opts
+  }
 }; # sqlite-config-bootstrap
 
 ########################################################################
diff --git a/manifest b/manifest
index 9b1a8780b3..ec9077572f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C ICU\sconfig\ssupport:\sadd\smore\sdetails\sto\serror\smessages\sand\scorrect\sa\stypo\swhich\swould\scause\sa\sconfigure\scrash\sif\s--with-icu-config=X\srefered\sto\sa\snon-executable\sX.
-D 2025-02-14T16:42:37.638
+C Work\saround\sa\sautosetup\s--help\sbug\swhich\sonly(?)\striggers\son\stcl\s8.6,\sintroduced\sby\s[9978c87139b7b042]\sand\sreported\supstream\sas\s[https://github.com/msteveb/autosetup/issues/73|ticket\s#73].\sSummary:\scalling\s'options'\sfrom\sa\sproc,\sinstead\sof\sthe\sglobal\sscope,\striggers\san\serror\sabout\san\sinvalid\suse\sof\s'break'.
+D 2025-02-14T17:21:05.787
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
-F auto.def 542572667678019e75e16c3e970bfb9358abed9a6ec70f3715997dd9a04b7fd9
+F auto.def 559f8f904a63950fcbe8d5692141ea4e5bf6b1e38ffb25b89a572d829d8ea648
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
 F autoconf/Makefile.in 0c71fcc6b2bd1703799a8e5b8f137ba64aad9bdee43c3cc23598cd0d6ce95715
 F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
-F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1ffdb
+F autoconf/auto.def ef517ef2bb4445b0df5644ef06ba414538192f6e62ad4c03f56d8041a9a78d88
 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e
 F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f
-F autosetup/sqlite-config.tcl c0a5e95b10d8168eb0f942a9d46b1b6a31a06a19991a294d2eace6b0a9d7e897
+F autosetup/sqlite-config.tcl 6a2f007f7c190a0077b99bd442d5bd41638f3d329c08a045653e096f21c9d16d
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -2207,8 +2207,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 5964616dc9de9323fddfede0ded29ee135498c8760017ce1158461f596fe6914
-R 8f2beaf5ac609f50ce863af5a49fb8f4
+P ff508926651d632d86081ccde89d3367c89538dde469e9e925540d634ac8a416
+R f4836849041855b59c987e999995c2b8
 U stephan
-Z a0a82d139cbfe850e3642558116bae4d
+Z 3d0710da40d3f26ab6ec370f0db703f9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ac337f3b52..67eb80d7f6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff508926651d632d86081ccde89d3367c89538dde469e9e925540d634ac8a416
+6a21d6a2ed627ba0a864bef85369ed17553b808ae5c19891fa1f70505dfcbe39