diff options
| author |   Zachary Ware <zachary.ware@gmail.com> | 2016-02-22 04:08:30 -0600 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-02-22 04:08:30 -0600 |
| commit | c46a2ebaff1be90707ef28656649bca025e8e395 (patch) | |
| tree | 3202f853129ee5ca1f9fd4184e2b55e78b59d291 /PCbuild | |
| parent | Issue #26261: Clarify NamedTemporaryFile name attribute vs file.name (diff) | |
| download | cpython-c46a2ebaff1be90707ef28656649bca025e8e395.tar.gz cpython-c46a2ebaff1be90707ef28656649bca025e8e395.tar.bz2 cpython-c46a2ebaff1be90707ef28656649bca025e8e395.zip | |
Issue #26268: Update Windows builds to use OpenSSL 1.0.2f
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_hashlib.vcxproj | 2 | ||||
| -rw-r--r-- | PCbuild/_ssl.vcxproj | 2 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/openssl.props | 5 | ||||
| -rw-r--r-- | PCbuild/python.props | 4 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj index 0f98966a879..5616a1e4cab 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -61,7 +61,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>ws2_32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj index fff23c7bc2c..73c95713a0c 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -61,7 +61,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index ffd1a16216e..333ee8250c0 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -58,7 +58,7 @@ set libraries= set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2d
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2f
set libraries=%libraries% sqlite-3.6.21
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index 54f3596fb00..e45964ee87f 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -15,9 +15,8 @@ <PreprocessorDefinitions Include="_CRT_SECURE_NO_WARNINGS" /> <PreprocessorDefinitions Include="_CRT_SECURE_NO_DEPRECATE" /> <PreprocessorDefinitions Include="OPENSSL_THREADS" /> - <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" /> + <!-- <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" /> --> <PreprocessorDefinitions Include="OPENSSL_IA32_SSE2" /> - <PreprocessorDefinitions Include="OPENSSL_CPUID_OBJ" /> <PreprocessorDefinitions Include="SHA1_ASM" /> <PreprocessorDefinitions Include="SHA256_ASM" /> <PreprocessorDefinitions Include="SHA512_ASM" /> @@ -51,7 +50,7 @@ <ClCompile> <!-- Suppress 64-bit truncation warnings - they aren't ours to worry about --> <DisableSpecificWarnings>4244;4267</DisableSpecificWarnings> - <AdditionalIncludeDirectories>$(opensslDir);$(opensslDir)include;$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(opensslDir);$(opensslIncludeDir);$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(_PreprocessorDefinitionList);%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> diff --git a/PCbuild/python.props b/PCbuild/python.props index 08ddaf12f05..d51e58baa81 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -35,7 +35,9 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir> - <opensslDir>$(ExternalsDir)openssl-1.0.2d\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir> + <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> + <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <!-- Suffix for all binaries when building for debug --> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 2388535cf05..c15c3643ba2 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -183,7 +183,7 @@ _bz2 Homepage:
http://www.bzip.org/
_ssl
- Python wrapper for version 1.0.2d of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2f of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
|