From 360abdca9cde36877d51072dbfaf3d4ac60025af Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 15 Feb 2025 14:13:35 +0000 Subject: [PATCH] A cleaner workaround for [6a21d6a2]. FossilOrigin-Name: 467804412230450c63ec47e8f903e58dce971a4752c242c3fa6b1249e535d2ac --- auto.def | 7 +------ autoconf/auto.def | 7 +------ autosetup/sqlite-config.tcl | 14 +++++++------- manifest | 18 +++++++++--------- manifest.uuid | 2 +- 5 files changed, 19 insertions(+), 29 deletions(-) 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 + # 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 bb210334ec..2e61348c4c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C More\sinformative\soutput\sfor\sthe\spthread\sfeature\stest. -D 2025-02-14T18:18:27.751 +C A\scleaner\sworkaround\sfor\s[6a21d6a2]. +D 2025-02-15T14:13:35.291 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 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 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 42119a2e899e319b92f3159952b7ef7219c82cb45eeb636aaf8d909def8150f8 -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 @@ -2209,9 +2209,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f8843b82921621f24c81092debd3c9a5225b498efd47e494c70378342f06b060 -Q +01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc -R 59ecf92d23a07b6c41368c9ce6a17db3 +P adf042fba614e1fbe694cf111b7c8f5408eb64031b799870495748c51c7d458c +Q +334ed723d0fc0b202f79a9746459181f637ca99c54864a4aa11629eecb4b8d0c +R 4237d77fc38e973d11e33188aecfedaf U stephan -Z 28f406c545f54fa0b8725bfc6bd70389 +Z ab0e4cdf9606a351803bd0412a5cf86c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bf9e5b1b74..4c1cc8d6e5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -adf042fba614e1fbe694cf111b7c8f5408eb64031b799870495748c51c7d458c +467804412230450c63ec47e8f903e58dce971a4752c242c3fa6b1249e535d2ac -- 2.47.2