diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-08 15:51:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-08 15:51:46 (GMT) |
| commit | 6f3b0bd108aee3078fa25557f8831d12afd42ea1 (patch) | |
| tree | 09f37b0e998b8e5e6d0c15bcab6339bdebb7e2ec /library | |
| parent | b142586b211b0e3b339168b0227baa42d975a7f2 (diff) | |
| download | tcl-6f3b0bd108aee3078fa25557f8831d12afd42ea1.zip tcl-6f3b0bd108aee3078fa25557f8831d12afd42ea1.tar.gz tcl-6f3b0bd108aee3078fa25557f8831d12afd42ea1.tar.bz2 | |
Bugfix in TIP #430 implementation: tcl_findLibrary should use the same zip-file naming as the configure scripts do
Diffstat (limited to 'library')
| -rw-r--r-- | library/auto.tcl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/library/auto.tcl b/library/auto.tcl index db7952a..51d4ef1 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -77,7 +77,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { catch { set found 0 set root [zipfs root] - set mountpoint [file join $root lib [string tolower $basename]] + set mountpoint [file join $root lib $basename] lappend dirs [file join $root app ${basename}_library] lappend dirs [file join $root lib $mountpoint ${basename}_library] lappend dirs [file join $root lib $mountpoint] @@ -86,7 +86,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { set found 0 foreach pkgdat [info loaded] { lassign $pkgdat dllfile dllpkg - if {[string tolower $dllpkg] ne [string tolower $basename]} continue + if {$dllpkg ne $basename} continue if {$dllfile eq {}} { # Loaded statically break @@ -101,8 +101,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { lappend paths [::${basename}::pkgconfig get libdir,runtime] lappend paths [::${basename}::pkgconfig get bindir,runtime] if {[catch {::${basename}::pkgconfig get zipfile,runtime} zipfile]} { - set zipfile [string tolower \ - "lib${basename}_[join [list {*}[split $version .] {*}$patch] _].zip"] + set zipfile "lib${basename}[join [split $patch .] _].zip" } lappend paths [file dirname [file join [pwd] [info nameofexecutable]]] foreach path $paths { |