diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | library/platform/platform.tcl | 9 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2010-04-14 Andreas Kupries <andreask@activestate.com> + + * library/platform/platform.tcl: Linux platform identification: + Check /lib64 for existence of files matching libc* before + accepting it as base directory. This can happen on weirdly + installed 32bit systems which have an empty or partially filled + /lib64 without an actual libc. Bumped to version 1.0.6. + 2010-04-13 Jan Nijtmans <nijtmans@users.sf.net> * win/tclWinPort.h Fix [Patch 2986105]: conditionally defining diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index 1e47f5d..d132c6f 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -175,7 +175,10 @@ proc ::platform::identify {} { set v unknown - if {[file exists /lib64] && [file isdirectory /lib64]} { + if {[file exists /lib64] && + [file isdirectory /lib64] && + [llength [glob -nocomplain -directory /lib64 libc*]] + } { set base /lib64 } else { set base /lib @@ -254,7 +257,7 @@ proc ::platform::patterns {id} { } } macosx*-* { - # 10.5+ + # 10.5+ if {[regexp {macosx([^-]*)-(.*)} $id -> v cpu]} { if {$v ne ""} { foreach {major minor} [split $v .] break @@ -289,7 +292,7 @@ proc ::platform::patterns {id} { # ### ### ### ######### ######### ######### ## Ready -package provide platform 1.0.5 +package provide platform 1.0.6 # ### ### ### ######### ######### ######### ## Demo application |