0911b0a263
The OpenSSL 1.1.1 release is currently the only supported version and it already has the Windows Arm64 support I was looking for. This change also explicitly enables thread support, which Python depends on since release 3.7, which removed the --without-threads build option. But the explicit OPENSSL_THREADS was just added in 3.8.4, so the old no-threads build fails now and was wrong since probably much longer. Change-Id: I61d94f966bc59407f213f4a81f0a49d0c05f8948 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98435 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
25 lines
1.1 KiB
Groff
25 lines
1.1 KiB
Groff
No use for applink.c OPENSSL_Applink, everything is compiled with the same MSVC
|
|
|
|
--- python3/PCbuild/_ssl.vcxproj.orig2 2019-12-23 15:54:19.254298900 +0100
|
|
+++ python3/PCbuild/_ssl.vcxproj 2019-12-23 15:54:24.693251200 +0100
|
|
@@ -67,9 +67,6 @@
|
|
</ItemDefinitionGroup>
|
|
<ItemGroup>
|
|
<ClCompile Include="..\Modules\_ssl.c" />
|
|
- <ClCompile Include="$(opensslIncludeDir)\applink.c">
|
|
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
- </ClCompile>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ResourceCompile Include="..\PC\python_nt.rc" />
|
|
--- python3/PCbuild/openssl.props.orig 2019-12-23 16:20:34.588135900 +0100
|
|
+++ python3/PCbuild/openssl.props 2019-12-23 16:20:51.074001300 +0100
|
|
@@ -6,8 +6,6 @@
|
|
</ItemDefinitionGroup>
|
|
<PropertyGroup>
|
|
<_DLLSuffix>-1_1</_DLLSuffix>
|
|
- <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
|
|
- <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
|
|
</PropertyGroup>
|
|
<ItemGroup>
|
|
<_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" />
|