summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-04-14 19:42:51 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-04-14 19:42:51 (GMT)
commit0ee4dce02b533c7cd697a44c87eddd6519fe0839 (patch)
tree98953b9d052c2abd52d51ace939d38f22865bd06
parent5055dc9378be7d7de8ad6803810d94cbecf17af8 (diff)
downloadtcl-0ee4dce02b533c7cd697a44c87eddd6519fe0839.zip
tcl-0ee4dce02b533c7cd697a44c87eddd6519fe0839.tar.gz
tcl-0ee4dce02b533c7cd697a44c87eddd6519fe0839.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.tcl7
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 43f9f1d..1c630d6 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-03 Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
* generic/tclStringObj.c: (SetStringFromAny): avoid trampling
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index 1a454cd..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
@@ -289,7 +292,7 @@ proc ::platform::patterns {id} {
# ### ### ### ######### ######### #########
## Ready
-package provide platform 1.0.5
+package provide platform 1.0.6
# ### ### ### ######### ######### #########
## Demo application