forked from amazingfate/loongoffice
4ff12ba6f4
The LO python3 target fails for me on Windows with:
C:\lode\dev\core\workdir\UnpackedTarball\python3\PCBuild\openssl.props(24,5):
error MSB3030: Datei "C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libcrypto-1_1.dll"
konnte nicht kopiert werden, da die Datei nicht gefunden wurde.
[C:\lode\dev\core\workdir\UnpackedTarball\python3\PCBuild\_ssl.vcxproj]
Same for
"C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libssl-1_1.pdb"
"C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libcrypto-1_1.pdb"
"C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libssl-1_1.dll"
Other files were also renamed in a previous hunk of this patch.
For other people these failures are silently ignored, but they
show up in their python3 build.log. But my msbuild version
15.9.21+g9802d43bc3 from VS2017 fails hard on these errors.
So this just adapt the pdb and dll names to match the previous
renames, which passes the copy calls, so the build continues.
Change-Id: Iffc848c334caec534f6e99f8bf83a42da570bbb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87358
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
41 lines
2.0 KiB
Groff
41 lines
2.0 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,7 +6,7 @@
|
|
</ClCompile>
|
|
<Link>
|
|
<AdditionalLibraryDirectories>$(opensslOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
- <AdditionalDependencies>ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
</ItemDefinitionGroup>
|
|
<PropertyGroup>
|
|
@@ -15,10 +15,10 @@
|
|
<_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
|
|
</PropertyGroup>
|
|
<ItemGroup>
|
|
- <_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" />
|
|
- <_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).pdb" />
|
|
- <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).dll" />
|
|
- <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).pdb" />
|
|
+ <_SSLDLL Include="$(opensslOutDir)\libeay32.dll" />
|
|
+ <_SSLDLL Include="$(opensslOutDir)\libeay32.pdb" />
|
|
+ <_SSLDLL Include="$(opensslOutDir)\ssleay32.dll" />
|
|
+ <_SSLDLL Include="$(opensslOutDir)\ssleay32.pdb" />
|
|
</ItemGroup>
|
|
<Target Name="_CopySSLDLL" Inputs="@(_SSLDLL)" Outputs="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build">
|
|
<Copy SourceFiles="@(_SSLDLL)" DestinationFolder="$(OutDir)" />
|