diff options
| author | Anselm Kruis <a.kruis@science-computing.de> | 2018-06-21 14:08:32 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2018-06-21 14:08:32 (GMT) |
| commit | 7b383a57145046a6a6ad6cd26f3139163df07885 (patch) | |
| tree | 44c4689b0b1ad2ab8c9d3be075abce666738030b | |
| parent | f2918881b7b2e13ed1091dad482aec2382358bcb (diff) | |
| download | cpython-7b383a57145046a6a6ad6cd26f3139163df07885.zip cpython-7b383a57145046a6a6ad6cd26f3139163df07885.tar.gz cpython-7b383a57145046a6a6ad6cd26f3139163df07885.tar.bz2 | |
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.
| -rw-r--r-- | PC/VS9.0/build.bat | 5 | ||||
| -rw-r--r-- | PC/VS9.0/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PC/VS9.0/readme.txt | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/PC/VS9.0/build.bat b/PC/VS9.0/build.bat index 2c846a5..0729ec7 100644 --- a/PC/VS9.0/build.bat +++ b/PC/VS9.0/build.bat @@ -76,9 +76,10 @@ if '%build_tkinter%'=='true' ( ) if '%build_tkinter%'=='true' ( 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" - 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 popd ) diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops index d4ced7b..ef28af8 100644 --- a/PC/VS9.0/pyproject.vsprops +++ b/PC/VS9.0/pyproject.vsprops @@ -82,7 +82,7 @@ /> <UserMacro Name="opensslDir" - Value="$(externalsDir)\openssl-1.0.2k" + Value="$(externalsDir)\openssl-1.0.2o" /> <UserMacro Name="tcltkDir" diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt index 55dda78..a4024d5 100644 --- a/PC/VS9.0/readme.txt +++ b/PC/VS9.0/readme.txt @@ -132,7 +132,7 @@ _ssl 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
obtaining external sources then you don't need to manually get the source
|