Issue #17425: Build with openssl 1.0.0k on Windows.

This commit is contained in:
Martin v. Loewis 2013-03-24 22:03:30 +01:00
parent 656c80809c
commit 5be6d74a0d
6 changed files with 9 additions and 7 deletions

View File

@ -1084,6 +1084,8 @@ Tests
Build
-----
- Issue #17425: Build with openssl 1.0.0k on Windows.
- Issue #16754: Fix the incorrect shared library extension on linux. Introduce
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.

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.0j
dist/openssl-1.0.0k
You need to use version 1.0.0j of OpenSSL.
You need to use version 1.0.0k 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.0j"
Value="$(externalsDir)\openssl-1.0.0k"
/>
<UserMacro
Name="tcltkDir"

View File

@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.0j"
Value="$(externalsDir)\openssl-1.0.0k"
/>
<UserMacro
Name="tcltkDir"

View File

@ -139,7 +139,7 @@ _ssl
Get the source code through
svn export http://svn.python.org/projects/external/openssl-1.0.0j
svn export http://svn.python.org/projects/external/openssl-1.0.0k
** 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.0j rd /s/q openssl-1.0.0j
@rem if exist openssl-1.0.0k rd /s/q openssl-1.0.0k
@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4
@rem bzip
@ -24,7 +24,7 @@ if not exist bzip2-1.0.6 (
)
@rem OpenSSL
if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j
if not exist openssl-1.0.0k svn export http://svn.python.org/projects/external/openssl-1.0.0k
@rem tcl/tk
if not exist tcl-8.5.9.0 (