diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-10-14 11:30:48 +0900 |
|---|---|---|
| committer | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-10-14 15:51:09 +0200 |
| commit | 7359700d5dc847accd360e70f7dcc45d119577be (patch) | |
| tree | 7b394f87a64ccff148d833c080f1d15bcb78adaa /external/python3 | |
| parent | 176e8cf09a527438ec9b2b20ba2df23fa45226bc (diff) | |
Upgrade libffi to 3.4.4
Change-Id: I417abc5d76db235c23195abff22d3d27f9c0fa77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157972
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
Diffstat (limited to 'external/python3')
| -rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 2 | ||||
| -rw-r--r-- | external/python3/python-3.8-msvc-libffi.patch.1 | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 127dea4a8ee4..93cb9015c9a6 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -12,6 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,python3)) $(eval $(call gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL),,python3)) $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\ + PCbuild/libffi.props \ PCbuild/pcbuild.sln \ )) @@ -19,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/i100492-freebsd.patch.1 \ external/python3/python-3.3.0-darwin.patch.1 \ external/python3/python-3.8-msvc-sdk.patch.1 \ + external/python3/python-3.8-msvc-libffi.patch.1 \ external/python3/python-3.7.6-msvc-ssl.patch.1 \ external/python3/python-3.5.4-msvc-disable.patch.1 \ external/python3/ubsan.patch.0 \ diff --git a/external/python3/python-3.8-msvc-libffi.patch.1 b/external/python3/python-3.8-msvc-libffi.patch.1 new file mode 100644 index 000000000000..7a4490cd2f34 --- /dev/null +++ b/external/python3/python-3.8-msvc-libffi.patch.1 @@ -0,0 +1,16 @@ +--- python3/PCbuild/libffi.props.orig 2023-08-25 04:36:32.000000000 +0900 ++++ python3/PCbuild/libffi.props 2023-10-14 15:13:24.850511531 +0900 +@@ -6,11 +6,11 @@ + </ClCompile> + <Link> + <AdditionalLibraryDirectories>$(libffiOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> +- <AdditionalDependencies>libffi-7.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>libffi-8.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> +- <_LIBFFIDLL Include="$(libffiOutDir)\libffi-7.dll" /> ++ <_LIBFFIDLL Include="$(libffiOutDir)\libffi-8.dll" /> + </ItemGroup> + <Target Name="_CopyLIBFFIDLL" Inputs="@(_LIBFFIDLL)" Outputs="@(_LIBFFIDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build"> + <Copy SourceFiles="@(_LIBFFIDLL)" DestinationFolder="$(OutDir)" /> |