summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-04-14 19:43:12 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-04-14 19:43:12 (GMT)
commita3387d4927dad4d6a12d7f0509d16324384e0477 (patch)
treee23f04cfde543c9ef64579ca8af455c8598864dd
parentc06c61b28e8878da81a9b56f34c5570f3f3f747a (diff)
downloadtcl-a3387d4927dad4d6a12d7f0509d16324384e0477.zip
tcl-a3387d4927dad4d6a12d7f0509d16324384e0477.tar.gz
tcl-a3387d4927dad4d6a12d7f0509d16324384e0477.tar.bz2
* 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.
-rw-r--r--ChangeLog8
-rw-r--r--library/platform/platform.tcl9
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b73c2e8..aa30adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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