From: stephan Date: Mon, 26 May 2025 15:20:57 +0000 (+0000) Subject: When detecting TCLLIBDIR, skip over //zipfs paths, as the (file isdirectory) command... X-Git-Tag: major-release~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f010489549a39c5c89259ff864ffef57a06dc4b;p=thirdparty%2Fsqlite.git When detecting TCLLIBDIR, skip over //zipfs paths, as the (file isdirectory) command will actually return true for those, but they're useless for installation purposes. This resolves the tea build's inability to install on stock openbsd. FossilOrigin-Name: 5b29724a3287c9a910f303faf056d0706b66c3e6ba23f9746c11d775c631f374 --- diff --git a/autosetup/teaish/core.tcl b/autosetup/teaish/core.tcl index 381597ec56..93effbc41f 100644 --- a/autosetup/teaish/core.tcl +++ b/autosetup/teaish/core.tcl @@ -817,7 +817,9 @@ proc teaish__check_tcl {} { if {"" ne $withSh && [catch {exec echo "puts stdout \$auto_path" | "$withSh"} result] == 0} { foreach i $result { - if {[file isdirectory $i]} { + if {![string match //zip* $i] && [file isdirectory $i]} { + # isdirectory actually passes on //zipfs:/..., but those are + # useless for our purposes set tcllibdir $i/$extDirName break } diff --git a/manifest b/manifest index 6523f1badb..408bd43308 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C tclsqlite.c\sdoc\stypo\sfix. -D 2025-05-26T07:15:20.435 +C When\sdetecting\sTCLLIBDIR,\sskip\sover\s//zipfs\spaths,\sas\sthe\s(file\sisdirectory)\scommand\swill\sactually\sreturn\strue\sfor\sthose,\sbut\sthey're\suseless\sfor\sinstallation\spurposes.\sThis\sresolves\sthe\stea\sbuild's\sinability\sto\sinstall\son\sstock\sopenbsd. +D 2025-05-26T15:20:57.472 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -51,7 +51,7 @@ F autosetup/proj.tcl c4a77735b57f3c016a185bff048212a197b77723f9bea6cfafe396e4b54 F autosetup/sqlite-config.tcl ccda82e43e377b832aae72a1678b1dc17dcaff36ed0ebbd8f0cfc88612ae8de3 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F autosetup/teaish/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca -F autosetup/teaish/core.tcl 1ebbe849d8e716424a3ffe9384c7e8b352b3e1194d3d4a153b125cc5176b3715 +F autosetup/teaish/core.tcl 3d5b54158922a946c240e916d1c43a5cb9803166b302d61f7d61f080faa93ad9 F autosetup/teaish/feature.tcl 18194fb79a24d30e5bbdeab40999616f39278b53a27525349ded033af2fd73be F autosetup/teaish/tester.tcl 091745984473faea6985254b9986c6dfd0cce06f68bc515ba4afc1e6b3742fa8 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 28215d131cd970a2756338579fb6b6091ab155be8f419505cae8ac918956165c -R 0bd71eeaf4b7d0c078bec1e70dd7f93a +P de0dfac1e5ca9d2661674c20664095386f60c77378311507fcba08111df52b38 +R 3fa837495725ba451f48513795489ef0 U stephan -Z fe2139900473a36410fefd9d8a460091 +Z 426be4d03da492ca6b0d0903f0942112 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e95aa14987..fac31d8e2a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -de0dfac1e5ca9d2661674c20664095386f60c77378311507fcba08111df52b38 +5b29724a3287c9a910f303faf056d0706b66c3e6ba23f9746c11d775c631f374