languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-16 00:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-439)

Browse source
This commit is contained in:
Zachary Ware 2017-03-03 16:07:07 -06:00 committed by GitHub
parent 0705f66eb3
commit fc64c351c7
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -806,6 +806,8 @@ Documentation
Build
-----
- bpo-29572: Update Windows build and OS X installers to use OpenSSL 1.0.2k.
- Issue #27659: Prohibit implicit C function declarations: use
-Werror=implicit-function-declaration when possible (GCC and Clang, but it
depends on the compiler version). Patch written by Chi Hsuan Yen.

2
PCbuild/get_externals.bat
View file

@ -54,7 +54,7 @@ echo.Fetching external libraries...
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.2j
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k
set libraries=%libraries% sqlite-3.14.2.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0

2
PCbuild/python.props
View file

@ -45,7 +45,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

2
PCbuild/readme.txt
View file

@ -169,7 +169,7 @@ _lzma
Homepage:
http://tukaani.org/xz/
_ssl
Python wrapper for version 1.0.2j of the OpenSSL secure sockets
Python wrapper for version 1.0.2k of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/