mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #28248: Merge with 3.4

Browse source
This commit is contained in:
Zachary Ware 2016-10-10 22:11:12 -05:00
commit fd28cbef4b
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -464,6 +464,8 @@ Windows
Build Build
----- -----
- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
- Issue #28258: Fixed build with Estonian locale (python-config and distclean - Issue #28258: Fixed build with Estonian locale (python-config and distclean
targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis. targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis.

2
PCbuild/get_externals.bat
View file

@ -54,7 +54,7 @@ echo.Fetching external libraries...
set libraries= set libraries=
set libraries=%libraries% bzip2-1.0.6 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% 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.8.11.0 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% tcl-core-8.6.4.2
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2

2
PCbuild/python.props
View file

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

2
PCbuild/readme.txt
View file

@ -169,7 +169,7 @@ _lzma
Homepage: Homepage:
http://tukaani.org/xz/ http://tukaani.org/xz/
_ssl _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 library, which is built by ssl.vcxproj
Homepage: Homepage:
http://www.openssl.org/ http://www.openssl.org/