[Python-checkins] cpython (merge 3.5 -> default): Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
steve.dower
python-checkins at python.org
Tue Mar 8 13:30:17 EST 2016
https://hg.python.org/cpython/rev/e045f26ea74a
changeset: 100462:e045f26ea74a
parent: 100458:fefedbaac640
parent: 100461:6d7f0421b71f
user: Steve Dower <steve.dower at microsoft.com>
date: Tue Mar 08 10:29:24 2016 -0800
summary:
Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
files:
Misc/NEWS | 2 ++
PCbuild/get_externals.bat | 2 +-
PCbuild/prepare_ssl.bat | 4 ++--
PCbuild/python.props | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -793,6 +793,8 @@
Build
-----
+- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
+
- Issue #25348: Added ``--pgo`` and ``--pgo-job`` arguments to
``PCbuild\build.bat`` for building with Profile-Guided Optimization. The
old ``PCbuild\build_pgo.bat`` script is removed.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@
set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2f
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g
set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
diff --git a/PCbuild/prepare_ssl.bat b/PCbuild/prepare_ssl.bat
--- a/PCbuild/prepare_ssl.bat
+++ b/PCbuild/prepare_ssl.bat
@@ -1,6 +1,6 @@
@echo off
if not defined HOST_PYTHON (
- if %1 EQU Debug (
+ if "%1" EQU "Debug" (
shift
set HOST_PYTHON=python_d.exe
if not exist python36_d.dll exit 1
@@ -9,4 +9,4 @@
if not exist python36.dll exit 1
)
)
-%HOST_PYTHON% prepare_ssl.py %1
+%HOST_PYTHON% "%~dp0prepare_ssl.py" %1
diff --git a/PCbuild/python.props b/PCbuild/python.props
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -41,7 +41,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
- <opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir>
+ <opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list