components/tcl/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.7/configure.~1~      2015-07-07 20:16:02.000000000 +0000
  14 +++ tls1.6.7/configure  2017-07-19 09:35:20.823716591 +0000
  15 @@ -10345,7 +10345,12 @@
  16      eval "LD_SEARCH_FLAGS=\"${LD_SEARCH_FLAGS}\""
  17      if test -n "${OPENSSL}"; then
  18
  19 -    vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
  20 +    if test "${with_ssl_dir+set}" = set; then
  21 +        vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
  22 +    else
  23 +        vars="${LD_SEARCH_FLAGS} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
  24 +    fi
  25 +
  26      for i in $vars; do
  27         if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
  28             # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
  29 @@ -10389,6 +10394,11 @@
  30          else
  31              TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
  32          fi
  33 +        if test "$do64bit_ok" = "yes" ; then
  34 +            TCLSH_PROG="${TCL_BIN_DIR}/${MACH64DIR}/${TCLSH_PROG}"
  35 +        else
  36 +            TCLSH_PROG="${TCL_BIN_DIR}/${MACH32DIR}/${TCLSH_PROG}"
  37 +        fi
  38      else
  39          # tclConfig.sh is in install location
  40          if test "${TEA_PLATFORM}" = "windows"; then
  41 @@ -10405,7 +10415,11 @@
  42                  break
  43              fi
  44          done
  45 -        TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}"
  46 +        if test "$do64bit_ok" = "yes" ; then
  47 +            TCLSH_PROG="${REAL_TCL_BIN_DIR}${MACH64DIR}/${TCLSH_PROG}"
  48 +        else
  49 +            TCLSH_PROG="${REAL_TCL_BIN_DIR}${MACH32DIR}/${TCLSH_PROG}"
  50 +        fi
  51      fi
  52      echo "$as_me:$LINENO: result: ${TCLSH_PROG}" >&5
  53  echo "${ECHO_T}${TCLSH_PROG}" >&6