database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00
Code Activity

A portability fix for proj.tcl: some Tcl builds do not like (array set x $someArray). Also better --mandir handling on Haiku (where the former problem was found).7

Browse Source 
FossilOrigin-Name: 849534499d9b2056c0eabef7f3e65f79f58e8a6fefb3f7603de44774da7166b5
This commit is contained in:
stephan
2025-04-16 14:21:48 +00:00
parent b1cc4aeb61
commit b70d450426
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
autosetup/proj.tcl
View File

@ -1526,19 +1526,28 @@ proc proj-tclConfig-sh-to-autosetup {tclConfigSh} {
# proj-remap-autoconf-dir-vars late in the config process (immediately # proj-remap-autoconf-dir-vars late in the config process (immediately
# before ".in" files are filtered). # before ".in" files are filtered).
# #
# Similar modifications may be made for --mandir.
#
# Returns 1 if it modifies the environment, else 0. # Returns 1 if it modifies the environment, else 0.
proc proj-tweak-default-env-dirs {} { proc proj-tweak-default-env-dirs {} {
set rc 0
switch -glob -- [get-define host] { switch -glob -- [get-define host] {
*-haiku { *-haiku {
set hpre /boot/home/config/non-packaged
if {![proj-opt-was-provided prefix]} { if {![proj-opt-was-provided prefix]} {
proj-opt-set prefix $hpre set hdir /boot/home/config/non-packaged
define prefix $hpre proj-opt-set prefix $hdir
return 1 define prefix $hdir
incr rc
}
if {![proj-opt-was-provided mandir]} {
set hdir /boot/system/documentation/man
proj-opt-set mandir $hdir
define mandir $hdir
incr rc
} }
} }
} }
return 0 return $rc
} }
######################################################################## ########################################################################
@ -2049,7 +2058,7 @@ proc proj-parse-simple-flags {argvName tgtArrayName prototype} {
set dflt($k) $v set dflt($k) $v
} }
# Now look for those flags in the source list # Now look for those flags in the source list
array set tgt $dflt array set tgt [array get dflt]
unset dflt unset dflt
set rc 0 set rc 0
set rv {} set rv {}

12
manifest
View File

@ -1,5 +1,5 @@
C Latest\supstream\steaish\sfor\sfixes\sand\simprovements. C A\sportability\sfix\sfor\sproj.tcl:\ssome\sTcl\sbuilds\sdo\snot\slike\s(array\sset\sx\s$someArray).\sAlso\sbetter\s--mandir\shandling\son\sHaiku\s(where\sthe\sformer\sproblem\swas\sfound).7
D 2025-04-16T12:48:27.368 D 2025-04-16T14:21:48.040
F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@ -51,7 +51,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1821baf61bc86a7e F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1821baf61bc86a7e
F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
F autosetup/proj.tcl ce217cdf7defa6b69664039039d7bbf064d00cb849e9cc64c6597f0f447e5e84 F autosetup/proj.tcl 5d214dd3e9ffc7cf8dfda0b2f047c76316bbe70ad5bb0d715fee75c8676daeea
F autosetup/sqlite-config.tcl bde169c42d5d5331485ae7785f5dd19ca1aa01315787e8306441c472ad4e4201 F autosetup/sqlite-config.tcl bde169c42d5d5331485ae7785f5dd19ca1aa01315787e8306441c472ad4e4201
F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
@ -2216,8 +2216,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P d22475b81c4e26ccc50f3b5626d43b32f7a2de34e5a764539554665bdda735d5 P 8f9148b33e01aa7963140704ef16e4304799e5842fa60e55373ccdabe8e3616d
R 244c408285d69971e2cf8a84cb501cc6 R aa0fe7da73c9edbabf2fa6a65ab77ae7
U stephan U stephan
Z cd79baf6d120e2ca68da7047ac9f0e56 Z dbb524d743adce9b01d6d0dc64cf862b
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@ -1 +1 @@
8f9148b33e01aa7963140704ef16e4304799e5842fa60e55373ccdabe8e3616d 849534499d9b2056c0eabef7f3e65f79f58e8a6fefb3f7603de44774da7166b5