Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/tcl/tcl/patches/4.init.tcl.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 835 b6a2cd5fcda6
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
835
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     1
 
--- tcl8.5.9/library/init.tcl.orig	2012-05-17 05:28:16.038636462 -0700
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     2
 
+++ tcl8.5.9/library/init.tcl	2012-05-17 05:29:58.370740558 -0700
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
@@ -43,7 +43,16 @@
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     4
 
     if {[info exists env(TCLLIBPATH)]} {
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
 	set auto_path $env(TCLLIBPATH)
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
 
     } else {
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     7
 
-	set auto_path ""
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
 
+        # Add in $MACH64 library directory (if needed).
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
 
+        if {$tcl_platform(wordSize) == 8} {
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
+            if {$tcl_platform(machine) eq "i86pc"} {
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
 
+                set auto_path "/usr/lib/amd64"
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    12
 
+            } else {
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    13
 
+                set auto_path "/usr/lib/sparcv9"
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    14
 
+            }
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    15
 
+        } else {
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    16
 
+            set auto_path ""
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    17
 
+        }
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    18
 
     }
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    19
 
 }
b6a2cd5fcda6 7166472 expect does not work with tclsh
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    20
 
 namespace eval tcl {
upstream/oracle/userland-gate