Closes #17962: Build with OpenSSL 1.0.1e on Windows.

This commit is contained in:
Georg Brandl 2013-05-12 19:50:34 +02:00
parent 997d05d89f
commit 84fc4ba67e
7 changed files with 12 additions and 10 deletions

View File

@ -250,6 +250,8 @@ Build
- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
4.8.
- Issue #17962: Build with OpenSSL 1.0.1e on Windows.
What's New in Python 3.3.1?
===========================

View File

@ -153,9 +153,9 @@ _ssl
Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as
dist/openssl-1.0.1d
dist/openssl-1.0.1e
You need to use version 1.0.1d of OpenSSL.
You need to use version 1.0.1e of OpenSSL.
You can install the NASM assembler from
http://www.nasm.us/

View File

@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.1d"
Value="$(externalsDir)\openssl-1.0.1e"
/>
<UserMacro
Name="tcltkDir"

View File

@ -62,7 +62,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.1d"
Value="$(externalsDir)\openssl-1.0.1e"
/>
<UserMacro
Name="tcltkDir"

View File

@ -20,7 +20,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
<opensslDir>$(externalsDir)\openssl-1.0.1d</opensslDir>
<opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>

View File

@ -142,7 +142,7 @@ _ssl
Get the source code through
svn export http://svn.python.org/projects/external/openssl-1.0.1d
svn export http://svn.python.org/projects/external/openssl-1.0.1e
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source

View File

@ -14,7 +14,7 @@ cd ..
@rem if exist tk8.4.16 rd /s/q tk8.4.16
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20
@rem if exist openssl-1.0.1d rd /s/q openssl-1.0.1d
@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1e
@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
@rem bzip
@ -24,9 +24,9 @@ if not exist bzip2-1.0.6 (
)
@rem OpenSSL
if not exist openssl-1.0.1d (
rd /s/q openssl-1.0.1c
svn export http://svn.python.org/projects/external/openssl-1.0.1d
if not exist openssl-1.0.1e (
rd /s/q openssl-1.0.1d
svn export http://svn.python.org/projects/external/openssl-1.0.1e
)
@rem tcl/tk