diff options
| author | Gabor Kelemen <gabor.kelemen.extern@allotropia.de> | 2023-08-02 21:19:13 +0200 |
|---|---|---|
| committer | Gabor Kelemen <gabor.kelemen.extern@allotropia.de> | 2023-08-02 21:19:13 +0200 |
| commit | 5a26d00088923a7f2bbcb2d149ff869b7150f14a (patch) | |
| tree | 5314ee73cf97f1995e358814dfdac092bc987ea1 | |
| parent | tdf#140236 WIN install libffi with Python (diff) | |
| download | core-5a26d00088923a7f2bbcb2d149ff869b7150f14a.tar.gz core-5a26d00088923a7f2bbcb2d149ff869b7150f14a.zip | |
Un-break Python3 build
Some bits were missed from the openssl 1.1 update due to the
older Python main version, now apply those things from
commit 0911b0a26356aa53bb94a1d2171f36e6c2e28749
Change-Id: I3b48fe6dbc2fe065762cafd8fa6908a6e9976750
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 2 | ||||
| -rw-r--r-- | external/python3/python-3.7.6-msvc-ssl.patch.1 | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index c124a46f0798..36b4f0a0ce76 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(python3_WIN_PLATFORM_MSBUILD) \ /p:opensslIncludeDir=$(call gb_UnpackedTarball_get_dir,openssl)/include \ - /p:opensslOutDir=$(call gb_UnpackedTarball_get_dir,openssl)/out32dll \ + /p:opensslOutDir=$(call gb_UnpackedTarball_get_dir,openssl)/ \ /p:zlibDir=$(call gb_UnpackedTarball_get_dir,zlib) \ /p:libffiOutDir=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/.libs \ /p:libffiIncludeDir=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/include \ 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 ca41f13b6ca5..11d6f85aaffb 100644 --- a/external/python3/python-3.7.6-msvc-ssl.patch.1 +++ b/external/python3/python-3.7.6-msvc-ssl.patch.1 @@ -14,12 +14,13 @@ No use for applink.c OPENSSL_Applink, everything is compiled with the same MSVC <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>
+@@ -11,8 +11,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" />
+
|