mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
bpo-45022: Update libffi to 3.4.2 in Windows build (GH-28146)
This commit is contained in:
parent
bc1c49fa94
commit
6f8bc464e0
|
@ -0,0 +1 @@
|
||||||
|
Update Windows release to include libffi 3.4.2
|
|
@ -52,7 +52,7 @@ echo.Fetching external libraries...
|
||||||
|
|
||||||
set libraries=
|
set libraries=
|
||||||
set libraries=%libraries% bzip2-1.0.6
|
set libraries=%libraries% bzip2-1.0.6
|
||||||
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0
|
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.2
|
||||||
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1l
|
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1l
|
||||||
set libraries=%libraries% sqlite-3.35.5.0
|
set libraries=%libraries% sqlite-3.35.5.0
|
||||||
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0
|
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0
|
||||||
|
@ -76,7 +76,7 @@ for %%e in (%libraries%) do (
|
||||||
echo.Fetching external binaries...
|
echo.Fetching external binaries...
|
||||||
|
|
||||||
set binaries=
|
set binaries=
|
||||||
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.3.0
|
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.2
|
||||||
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1l
|
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1l
|
||||||
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0
|
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0
|
||||||
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
|
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalLibraryDirectories>$(libffiOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(libffiOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>libffi-7.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>libffi-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<_LIBFFIDLL Include="$(libffiOutDir)\libffi-7.dll" />
|
<_LIBFFIDLL Include="$(libffiOutDir)\libffi-8.dll" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Target Name="_CopyLIBFFIDLL" Inputs="@(_LIBFFIDLL)" Outputs="@(_LIBFFIDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build">
|
<Target Name="_CopyLIBFFIDLL" Inputs="@(_LIBFFIDLL)" Outputs="@(_LIBFFIDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build">
|
||||||
<Copy SourceFiles="@(_LIBFFIDLL)" DestinationFolder="$(OutDir)" />
|
<Copy SourceFiles="@(_LIBFFIDLL)" DestinationFolder="$(OutDir)" />
|
||||||
|
|
|
@ -60,8 +60,8 @@
|
||||||
<sqlite3Dir>$(ExternalsDir)sqlite-3.35.5.0\</sqlite3Dir>
|
<sqlite3Dir>$(ExternalsDir)sqlite-3.35.5.0\</sqlite3Dir>
|
||||||
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
|
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
|
||||||
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
|
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
|
||||||
<libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
|
<libffiDir>$(ExternalsDir)libffi-3.4.2\</libffiDir>
|
||||||
<libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
|
<libffiOutDir>$(ExternalsDir)libffi-3.4.2\$(ArchName)\</libffiOutDir>
|
||||||
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
|
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
|
||||||
<opensslDir>$(ExternalsDir)openssl-1.1.1l\</opensslDir>
|
<opensslDir>$(ExternalsDir)openssl-1.1.1l\</opensslDir>
|
||||||
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1l\$(ArchName)\</opensslOutDir>
|
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1l\$(ArchName)\</opensslOutDir>
|
||||||
|
|
Loading…
Reference in a new issue