cpython: a626a32bd42d (original) (raw)
Mercurial > cpython
changeset 82950:a626a32bd42d
#17425: merge 3.3 [#17425]
| Martin v. Löwis martin@v.loewis.de | |
|---|---|
| date | Sun, 24 Mar 2013 22:53:04 +0100 |
| parents | 173f57717601(current diff)ca2589243478(diff) |
| children | c9c877086d8b |
| files | Misc/NEWS PC/VS9.0/pyproject.vsprops PCbuild/pyproject.props PCbuild/readme.txt |
| diffstat | 5 files changed, 9 insertions(+), 7 deletions(-)[+] [-] Misc/NEWS 2 PC/VS9.0/pyproject.vsprops 2 PCbuild/pyproject.props 2 PCbuild/readme.txt 2 Tools/buildbot/external-common.bat 8 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -1143,6 +1143,8 @@ Tests Build ----- +- Issue #17425: Build with openssl 1.0.1d 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/VS9.0/pyproject.vsprops +++ b/PC/VS9.0/pyproject.vsprops @@ -62,7 +62,7 @@ /> <UserMacro Name="opensslDir" - Value="$(externalsDir)\openssl-1.0.1c" + Value="$(externalsDir)\openssl-1.0.1d" /> <UserMacro Name="tcltkDir"
--- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -20,7 +20,7 @@ $(externalsDir)\sqlite-3.7.12 $(externalsDir)\bzip2-1.0.6 $(externalsDir)\xz-5.0.3
- $(externalsDir)\openssl-1.0.1d $(externalsDir)\tcltk $(externalsDir)\tcltk64 $(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib
--- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -142,7 +142,7 @@ Python-controlled subprojects that wrap 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.1c rd /s/q openssl-1.0.1c +@rem if exist openssl-1.0.1d rd /s/q openssl-1.0.1d @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.1c (
- rd /s/q openssl-1.0.0j
- svn export http://svn.python.org/projects/external/openssl-1.0.1c[](#l5.18)
+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[](#l5.21)