[Libreoffice-commits] core.git: external/python3

[Jan-Marek Glogowski (via logerrit)]

 external/python3/python-3.7.6-msvc-ssl.patch.1 |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit 4ff12ba6f4639c73587f2bb58afcc3ca6fb30105
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Fri Jan 24 13:33:37 2020 +0000
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Fri Jan 24 21:14:48 2020 +0100

    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 at cib.de>
    Tested-by: Jenkins

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)" />