Commit 7b383a57 authored by Anselm Kruis's avatar Anselm Kruis Committed by Zachary Ware

bpo-33931: Fix building using PC\VS9.0\build.bat -e (GH-7844)

Set the openssl version to 1.0.2o and fix compiling Tcl.
parent f2918881
...@@ -76,9 +76,10 @@ if '%build_tkinter%'=='true' ( ...@@ -76,9 +76,10 @@ if '%build_tkinter%'=='true' (
) )
if '%build_tkinter%'=='true' ( if '%build_tkinter%'=='true' (
if not exist "%tcltkdir%\bin\tcl85%tcl_dbg_ext%.dll" ( if not exist "%tcltkdir%\bin\tcl85%tcl_dbg_ext%.dll" (
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install @rem clean, all and install need to be separate invocations, otherwise nmakehlp is not found on install
pushd "%tcldir%\win" pushd "%tcldir%\win"
nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" clean all nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" clean
nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" all
nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" install nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" install
popd popd
) )
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.2k" Value="$(externalsDir)\openssl-1.0.2o"
/> />
<UserMacro <UserMacro
Name="tcltkDir" Name="tcltkDir"
......
...@@ -132,7 +132,7 @@ _ssl ...@@ -132,7 +132,7 @@ _ssl
Get the source code through Get the source code through
svn export http://svn.python.org/projects/external/openssl-1.0.2k svn export http://svn.python.org/projects/external/openssl-1.0.2o
** NOTE: if you use the PCbuild\get_externals.bat approach for ** NOTE: if you use the PCbuild\get_externals.bat approach for
obtaining external sources then you don't need to manually get the source obtaining external sources then you don't need to manually get the source
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment