Skip to content

Commit 7ca9da9

Browse files
gh-101763: Update bundled copy of libffi to 3.4.4 on Windows (GH-101784)
(cherry picked from commit e1aaded) Co-authored-by: Steve Dower <steve.dower@python.org>
1 parent b0bba7a commit 7ca9da9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updates copy of libffi bundled with Windows installs to 3.4.4.

PCbuild/get_externals.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ echo.Fetching external libraries...
5252

5353
set libraries=
5454
set libraries=%libraries% bzip2-1.0.8
55-
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.3
55+
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
5656
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1t
5757
set libraries=%libraries% sqlite-3.39.4.0
5858
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1
@@ -76,7 +76,7 @@ for %%e in (%libraries%) do (
7676
echo.Fetching external binaries...
7777

7878
set binaries=
79-
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.3
79+
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.4
8080
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1t
8181
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.1
8282
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06

PCbuild/python.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.39.4.0\</sqlite3Dir>
7272
<bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
7373
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
74-
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.3\</libffiDir>
74+
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
7575
<libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
7676
<libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
7777
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1t\</opensslDir>

0 commit comments

Comments
 (0)