[Python-checkins] cpython (merge 3.3 -> default): #17425: merge 3.3
martin.v.loewis
python-checkins at python.org
Sun Mar 24 22:53:15 CET 2013
http://hg.python.org/cpython/rev/a626a32bd42d
changeset: 82950:a626a32bd42d
parent: 82947:173f57717601
parent: 82949:ca2589243478
user: Martin v. Löwis <martin at v.loewis.de>
date: Sun Mar 24 22:53:04 2013 +0100
summary:
#17425: merge 3.3
files:
Misc/NEWS | 2 ++
PC/VS9.0/pyproject.vsprops | 2 +-
PCbuild/pyproject.props | 2 +-
PCbuild/readme.txt | 2 +-
Tools/buildbot/external-common.bat | 8 ++++----
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1143,6 +1143,8 @@
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.
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
--- 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"
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -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.1c</opensslDir>
+ <opensslDir>$(externalsDir)\openssl-1.0.1d</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -142,7 +142,7 @@
Get the source code through
- svn export http://svn.python.org/projects/external/openssl-1.0.1c
+ svn export http://svn.python.org/projects/external/openssl-1.0.1d
** 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
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,7 +14,7 @@
@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
- at rem if exist openssl-1.0.1c rd /s/q openssl-1.0.1c
+ at 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 @@
)
@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
+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
)
@rem tcl/tk
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list