Issue #28248: Merge with 3.5
This commit is contained in:
commit
c08bb6c63a
|
@ -13,6 +13,11 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
Build
|
||||
-----
|
||||
|
||||
- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
|
||||
|
||||
|
||||
What's New in Python 3.6.0 beta 2
|
||||
=================================
|
||||
|
|
|
@ -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.2h
|
||||
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
|
||||
set libraries=%libraries% sqlite-3.14.1.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
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
<sqlite3Dir>$(ExternalsDir)sqlite-3.14.1.0\</sqlite3Dir>
|
||||
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
|
||||
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
|
||||
<opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
|
||||
<opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
|
||||
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
|
||||
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
|
||||
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
|
||||
|
|
|
@ -169,7 +169,7 @@ _lzma
|
|||
Homepage:
|
||||
http://tukaani.org/xz/
|
||||
_ssl
|
||||
Python wrapper for version 1.0.2h of the OpenSSL secure sockets
|
||||
Python wrapper for version 1.0.2j of the OpenSSL secure sockets
|
||||
library, which is built by ssl.vcxproj
|
||||
Homepage:
|
||||
http://www.openssl.org/
|
||||
|
|
Loading…
Reference in New Issue