Skip to content

Commit 7b383a5

Browse files
Anselm Kruiszware
authored andcommitted
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.
1 parent f291888 commit 7b383a5

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

PC/VS9.0/build.bat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ if '%build_tkinter%'=='true' (
7676
)
7777
if '%build_tkinter%'=='true' (
7878
if not exist "%tcltkdir%\bin\tcl85%tcl_dbg_ext%.dll" (
79-
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
79+
@rem clean, all and install need to be separate invocations, otherwise nmakehlp is not found on install
8080
pushd "%tcldir%\win"
81-
nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" clean all
81+
nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" clean
82+
nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" all
8283
nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" install
8384
popd
8485
)

PC/VS9.0/pyproject.vsprops

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
/>
8383
<UserMacro
8484
Name="opensslDir"
85-
Value="$(externalsDir)\openssl-1.0.2k"
85+
Value="$(externalsDir)\openssl-1.0.2o"
8686
/>
8787
<UserMacro
8888
Name="tcltkDir"

PC/VS9.0/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ _ssl
132132

133133
Get the source code through
134134

135-
svn export http://svn.python.org/projects/external/openssl-1.0.2k
135+
svn export http://svn.python.org/projects/external/openssl-1.0.2o
136136

137137
** NOTE: if you use the PCbuild\get_externals.bat approach for
138138
obtaining external sources then you don't need to manually get the source

0 commit comments

Comments
 (0)