components/tcltls/patches/tls.tcl.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 404 f62f2053b654
child 3655 609589e82875
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
404
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
     1
--- tls1.6/tls.tcl	Thu Mar 20 03:52:12 2008
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
     2
+++ tls1.6/tls.tcl	Mon Apr 21 16:36:08 2008
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
     3
@@ -26,6 +26,9 @@
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
     4
     # Irrelevant to unixoids, but for Windows this enables the OS to find
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
     5
     # the dependent DLL's in the CWD, where they may be.
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
     6
     set cwd [pwd]
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
     7
+    if {$::tcl_platform(wordSize) == 8} {
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
     8
+	append dir "/64"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
     9
+    }
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    10
     catch {cd $dir}
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    11
     set res [catch {uplevel #0 [list load [file join [pwd] $dll]]} err]
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    12
     catch {cd $cwd}
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    13
--- tls1.6/configure	Wed Mar 19 15:37:51 2008
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    14
+++ tls1.6/configure	Mon Jul  4 23:20:00 2011
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    15
@@ -8738,8 +8738,8 @@
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    16
 echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    17
 		    else
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    18
 			do64bit_ok=yes
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    19
-			CFLAGS="$CFLAGS -xarch=amd64"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    20
-			LDFLAGS="$LDFLAGS -xarch=amd64"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    21
+			CFLAGS="$CFLAGS -m64"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    22
+			LDFLAGS="$LDFLAGS -m64"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    23
 		    fi
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    24
 		else
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    25
 		    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported for $arch" >&5
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    26
@@ -10126,7 +10126,12 @@
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    27
     eval "LD_SEARCH_FLAGS=\"${LD_SEARCH_FLAGS}\""
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    28
     if test -n "${OPENSSL}"; then
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    29
 
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    30
-    vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    31
+    if test "${with_ssl_dir+set}" = set; then
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    32
+        vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    33
+    else
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    34
+        vars="${LD_SEARCH_FLAGS} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    35
+    fi
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    36
+
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    37
     for i in $vars; do
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    38
 	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    39
 	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    40
@@ -10170,6 +10175,11 @@
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    41
         else
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    42
             TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    43
         fi
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    44
+        if test "$do64bit_ok" = "yes" ; then
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    45
+            TCLSH_PROG="${TCL_BIN_DIR}/${MACH64DIR}/${TCLSH_PROG}"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    46
+        else
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    47
+            TCLSH_PROG="${TCL_BIN_DIR}/${TCLSH_PROG}"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    48
+        fi
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    49
     else
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    50
         # tclConfig.sh is in install location
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    51
         if test "${TEA_PLATFORM}" = "windows"; then
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    52
@@ -10186,7 +10196,11 @@
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    53
                 break
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    54
             fi
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    55
         done
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    56
-        TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    57
+        if test "$do64bit_ok" = "yes" ; then
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    58
+            TCLSH_PROG="${REAL_TCL_BIN_DIR}/${MACH64DIR}/${TCLSH_PROG}"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    59
+        else
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    60
+            TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}"
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    61
+        fi
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    62
     fi
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    63
     echo "$as_me:$LINENO: result: ${TCLSH_PROG}" >&5
f62f2053b654 7063147 migrate tcltls from SFW to userland
Liam Li<Liam.Li@Oracle.COM>
parents:
diff changeset
    64
 echo "${ECHO_T}${TCLSH_PROG}" >&6