From: stephan Date: Mon, 20 Jan 2025 16:11:36 +0000 (+0000) Subject: configure script: remove an overzealous is-a-file check in the tclsh search which... X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7578ff91bb0555ab651f38798eaafec76cec057;p=thirdparty%2Fsqlite.git configure script: remove an overzealous is-a-file check in the tclsh search which fails to account for implicit .exe extensions on Windows builds. FossilOrigin-Name: 89306d1a4905a0decf77d8fa0f7fc0c2131fafe0a20952427f11fdb205c216ae --- diff --git a/auto.def b/auto.def index b4a54111b9..ce8667f643 100644 --- a/auto.def +++ b/auto.def @@ -615,9 +615,7 @@ proc sqlite-check-tcl {} { if {"" ne $with_tclsh} { # --with-tclsh was provided or found above. Validate it and use it # to trump any value passed via --with-tcl=DIR. - if {![file isfile $with_tclsh]} { - proj-fatal "TCL shell $with_tclsh is not a file" - } elseif {![file-isexec $with_tclsh]} { + if {![file-isexec $with_tclsh]} { proj-fatal "TCL shell $with_tclsh is not executable" } else { define TCLSH_CMD $with_tclsh diff --git a/manifest b/manifest index 38c38c47dc..2575bf1afd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\scross-compiling,\schange\sthe\sCFLAGS\sdefault\sto\sexclude\s-g,\sper\s/chat\sdiscussion\sprompted\sby\s[forum:9a67df63eda9925c|forum\spost\s9a67df63eda9925c]. -D 2025-01-18T16:06:19.384 +C configure\sscript:\sremove\san\soverzealous\sis-a-file\scheck\sin\sthe\stclsh\ssearch\swhich\sfails\sto\saccount\sfor\simplicit\s.exe\sextensions\son\sWindows\sbuilds. +D 2025-01-20T16:11:36.691 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,7 +14,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 20ddd61060516e29cb984d716c451ad6e7e3ebe1d3786ec8f70813fada06eb2f +F auto.def 5795f5c616a4ce5b577352af3fe85a6563a4e9149fa8c5ee617330ef59d395a3 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -2205,9 +2205,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 cc29664f974b28b1d32c1938eb1929e1b4d5c724eaa299639dc7109bd876d3ee -Q +4309da2ca5cb99ea81f3034ae3c5809187c0131d21f9f9469ea0d69c941f393e -R 82555fe67c4719f0e2d7c350306737ab +P 675582481cf3ae99533739933c1ea8221fdd5d55f6439f4ed31c5aa5e82437b8 +R b6febae0a9b90f1db2f772dfc64e0a95 U stephan -Z 24831981519baa08e198f76d3e505f76 +Z 7f93fff9a551ed729bc3eabff49ba322 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b41c6aad09..807657490e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -675582481cf3ae99533739933c1ea8221fdd5d55f6439f4ed31c5aa5e82437b8 +89306d1a4905a0decf77d8fa0f7fc0c2131fafe0a20952427f11fdb205c216ae