cpython: 0fb7db2f9b5e (original) (raw)
Mercurial > cpython
changeset 82945:0fb7db2f9b5e 3.2
Issue #17425: Build with openssl 1.0.0k on Windows. [#17425]
| Martin v. Loewis martin@v.loewis.de | |
|---|---|
| date | Sun, 24 Mar 2013 22:03:30 +0100 |
| parents | 1c7c692de1ee |
| children | 8051e6ff97e2 e7795a178b0a b2cb7bc1edb8 |
| files | Misc/NEWS PC/VC6/readme.txt PC/VS8.0/pyproject.vsprops PCbuild/pyproject.vsprops PCbuild/readme.txt Tools/buildbot/external-common.bat |
| diffstat | 6 files changed, 9 insertions(+), 7 deletions(-)[+] [-] Misc/NEWS 2 PC/VC6/readme.txt 4 PC/VS8.0/pyproject.vsprops 2 PCbuild/pyproject.vsprops 2 PCbuild/readme.txt 2 Tools/buildbot/external-common.bat 4 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -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.
--- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -153,9 +153,9 @@ bz2 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[](#l2.7)
dist/openssl-1.0.0k[](#l2.8)
You can install the NASM assembler from http://www.nasm.us/[](#l2.14)
--- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -58,7 +58,7 @@ /> <UserMacro Name="opensslDir" - Value="$(externalsDir)\openssl-1.0.0j" + Value="$(externalsDir)\openssl-1.0.0k" /> <UserMacro Name="tcltkDir"
--- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -58,7 +58,7 @@ /> <UserMacro Name="opensslDir" - Value="$(externalsDir)\openssl-1.0.0j" + Value="$(externalsDir)\openssl-1.0.0k" /> <UserMacro Name="tcltkDir"
--- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -139,7 +139,7 @@ bz2 Get the source code through
** 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
--- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -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[](#l6.16) +if not exist openssl-1.0.0k svn export http://svn.python.org/projects/external/openssl-1.0.0k[](#l6.17) @rem tcl/tk if not exist tcl-8.5.9.0 (