components/tcltls/patches/tls.tcl.patch

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