Fossil SCM
Filter out inline shell variables from tclConfig.sh because they break the build on CentOS 5 with TCL 8.4.
Commit
cc008ebab7eda7e7ebc783a2413afcc2105a080d
Parent
0141e20ff041bf3…
1 file changed
+1
+1
| --- autosetup/local.tcl | ||
| +++ autosetup/local.tcl | ||
| @@ -20,10 +20,11 @@ | ||
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | proc parse-tclconfig-sh-file {filename} { |
| 23 | 23 | foreach line [split [readfile $filename] \n] { |
| 24 | 24 | if {[regexp {^(TCL_[^=]*)=(.*)$} $line -> name value]} { |
| 25 | + set value [regsub -all {\$\{.*\}} $value ""] | |
| 25 | 26 | set tclconfig($name) [string trim $value '] |
| 26 | 27 | } |
| 27 | 28 | } |
| 28 | 29 | return [array get tclconfig] |
| 29 | 30 | } |
| 30 | 31 |
| --- autosetup/local.tcl | |
| +++ autosetup/local.tcl | |
| @@ -20,10 +20,11 @@ | |
| 20 | } |
| 21 | |
| 22 | proc parse-tclconfig-sh-file {filename} { |
| 23 | foreach line [split [readfile $filename] \n] { |
| 24 | if {[regexp {^(TCL_[^=]*)=(.*)$} $line -> name value]} { |
| 25 | set tclconfig($name) [string trim $value '] |
| 26 | } |
| 27 | } |
| 28 | return [array get tclconfig] |
| 29 | } |
| 30 |
| --- autosetup/local.tcl | |
| +++ autosetup/local.tcl | |
| @@ -20,10 +20,11 @@ | |
| 20 | } |
| 21 | |
| 22 | proc parse-tclconfig-sh-file {filename} { |
| 23 | foreach line [split [readfile $filename] \n] { |
| 24 | if {[regexp {^(TCL_[^=]*)=(.*)$} $line -> name value]} { |
| 25 | set value [regsub -all {\$\{.*\}} $value ""] |
| 26 | set tclconfig($name) [string trim $value '] |
| 27 | } |
| 28 | } |
| 29 | return [array get tclconfig] |
| 30 | } |
| 31 |