From: stephan <stephan@noemail.net>
Date: Sat, 15 Feb 2025 14:12:24 +0000 (+0000)
Subject: A cleaner workaround for [6a21d6a2], provided by autosetup's creator.
X-Git-Tag: major-release~281
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e87ddc105c16f6557f041cc4426fbe72e5642ab;p=thirdparty%2Fsqlite.git

A cleaner workaround for [6a21d6a2], provided by autosetup's creator.

FossilOrigin-Name: 334ed723d0fc0b202f79a9746459181f637ca99c54864a4aa11629eecb4b8d0c
---

diff --git a/auto.def b/auto.def
index 8a964ad75c..9df87f579a 100644
--- a/auto.def
+++ b/auto.def
@@ -14,12 +14,7 @@
 #
 
 use sqlite-config
-if {0} {
-  sqlite-config-bootstrap canonical
-} else {
-  options [sqlite-config-bootstrap canonical]
-  sqlite-post-options-init
-}
+sqlite-config-bootstrap canonical
 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 ccbaaa89ee..bb8710378f 100644
--- a/autoconf/auto.def
+++ b/autoconf/auto.def
@@ -8,12 +8,7 @@
 # included in this source tree as ./autosetup/jimsh0.c.
 #
 use sqlite-config
-if {0} {
-  sqlite-config-bootstrap autoconf
-} else {
-  options [sqlite-config-bootstrap autoconf]
-  sqlite-post-options-init
-}
+sqlite-config-bootstrap autoconf
 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 d70220723f..ccb114868c 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -295,14 +295,14 @@ proc sqlite-config-bootstrap {buildMode} {
       }
     }
   }
-  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
+  #lappend opts "soname:=duplicateEntry => {x}"; #just testing
+  if {[catch {options $opts}]} {
+    # Workaround for <https://github.com/msteveb/autosetup/issues/73>
+    # where [options] behaves oddly on _some_ TCL builds when it's
+    # called from deeper than the global scope.
+    return -code break
   }
+  sqlite-post-options-init
 }; # sqlite-config-bootstrap
 
 ########################################################################
diff --git a/manifest b/manifest
index 17137cbb99..60ccc5f65f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sinformative\soutput\sfor\sthe\spthread\sfeature\stest.
-D 2025-02-14T18:17:31.710
+C A\scleaner\sworkaround\sfor\s[6a21d6a2],\sprovided\sby\sautosetup's\screator.
+D 2025-02-15T14:12:24.766
 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 6120063c2901500ee7ff662dee63f234fe24e546c9c0292c3fcb3beb9c2e59f5
+F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0
 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 c160516ad490b00fad64235323ff18323a6a6523607d2a9705f2ec38ea2f5c33
+F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1ffdb
 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 48c55d221189cda985cadd81a88d5a046d327db6e8c5f7395bfde577040ba59f
+F autosetup/sqlite-config.tcl 17b5417841c402dcf8f656749be6fcff651f3360c48afcdc01aad375fe414fec
 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 806ad1ac173d7c0d6d94bfccd3b961fc5c9541b32773c063a8c4082380d7a90d
-R 09a63536408c62281d4a45ffc0125d28
+P 01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc
+R 4a76560a1c5bc38f5777d5f7ba110253
 U stephan
-Z fe9efd4025c936400a0447a11687e271
+Z 15f10168d95dbdd3c940ff559a29ad5c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d3ca8dc79f..db6cfe8045 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc
+334ed723d0fc0b202f79a9746459181f637ca99c54864a4aa11629eecb4b8d0c