From: <net...@po...> - 2011-12-11 14:32:09
|
With tmk 0.9beta core version 1.127, including the word $ORIGIN in arguments to libspec_libpath triggers a bug where "uplevel" inteprets the word as a variable. ******** start patch ******** --- link.tmk 2011-12-11 09:00:30.000000000 -0500 +++ link.tmk.new 2011-12-11 09:04:16.000000000 -0500 @@ -243,19 +243,19 @@ return [list $libpath $syslibs $projlibs $opt] } proc libspec_libpath {spec} { - uplevel \#0 dbg_msg \"lib path is \{[lindex $spec 0]\}\" 2 + uplevel \#0 [list dbg_msg "lib path is {[lindex $spec 0]}" 2] uplevel \#0 return [lindex $spec 0] } proc libspec_syslibs {spec} { - uplevel \#0 dbg_msg \"syslibs are \{[lindex $spec 1]\}\" 2 + uplevel \#0 [list dbg_msg "syslibs are {[lindex $spec 1]}" 2] uplevel \#0 return [lindex $spec 1] } proc libspec_projlibs {spec} { - uplevel \#0 dbg_msg \"projlibs are \{[lindex $spec 2]\}\" 2 + uplevel \#0 [list dbg_msg "projlibs are {[lindex $spec 2]}" 2] uplevel \#0 return [lindex $spec 2] } proc libspec_options {spec} { - uplevel \#0 dbg_msg \"link mode is \{[lindex $spec 3]\}\" 2 + uplevel \#0 [list dbg_msg "link mode is {[lindex $spec 3]}" 2] uplevel \#0 return [lindex $spec 3] } # return list of dependencies for this libspec, static libs first ******** start patch ******** -- Yorick |