diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-10-11 03:22:27 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-10-11 03:22:27 (GMT) |
| commit | c08bb6c63a780d5558200f2fbf8619f31114f378 (patch) | |
| tree | 0e89df02e3976be7250478046a6e4688b87f66a0 /PCbuild | |
| parent | 4d80a8a9165bea1acb542c49cc37d32551284f5b (diff) | |
| parent | fd28cbef4b1a1b85f8fc6d936a8916302abdf171 (diff) | |
| download | cpython-c08bb6c63a780d5558200f2fbf8619f31114f378.zip cpython-c08bb6c63a780d5558200f2fbf8619f31114f378.tar.gz cpython-c08bb6c63a780d5558200f2fbf8619f31114f378.tar.bz2 | |
Issue #28248: Merge with 3.5
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 91a2a6d..de85402 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -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
diff --git a/PCbuild/python.props b/PCbuild/python.props index 2b9b903..fd7c4ad 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -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> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 34c2efe..b6372c2 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -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/
|