diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2020-01-24 13:33:37 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-01-24 21:14:48 +0100 |
| commit | 4ff12ba6f4639c73587f2bb58afcc3ca6fb30105 (patch) | |
| tree | 49b28b5f2d1d5d39c8bdc00c7b94335d1205b593 /external/python3/python-3.7.6-msvc-ssl.patch.1 | |
| parent | cac5ce6de095fd0595d1fa58e5a8d12aa8ca8b6f (diff) | |
python3+WIN: don't fail copy of openssl DLLs+PDBs
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
Diffstat (limited to 'external/python3/python-3.7.6-msvc-ssl.patch.1')
| -rw-r--r-- | external/python3/python-3.7.6-msvc-ssl.patch.1 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/external/python3/python-3.7.6-msvc-ssl.patch.1 b/external/python3/python-3.7.6-msvc-ssl.patch.1 index 14e7cca0a8ce..e8e94f674c1f 100644 --- a/external/python3/python-3.7.6-msvc-ssl.patch.1 +++ b/external/python3/python-3.7.6-msvc-ssl.patch.1 @@ -23,3 +23,18 @@ No use for applink.c OPENSSL_Applink, everything is compiled with the same MSVC </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)" />
|