summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@python.org>2022-09-23 15:07:53 (GMT)
committerGitHub <noreply@github.com>2022-09-23 15:07:53 (GMT)
commitf1cca801f50a92c0affede6bc22c3c1ec211358d (patch)
treed3b468b0389e15aee54a5c6cb9a58f222ef46f76
parent80bc7d7c0a3f777da244ec79429baf382523b8da (diff)
downloadcpython-f1cca801f50a92c0affede6bc22c3c1ec211358d.zip
cpython-f1cca801f50a92c0affede6bc22c3c1ec211358d.tar.gz
cpython-f1cca801f50a92c0affede6bc22c3c1ec211358d.tar.bz2
gh-96965: Update Windows release to libffi 3.4.3 (GH-97512)
-rw-r--r--Misc/NEWS.d/next/Windows/2022-09-23-15-40-04.gh-issue-96965.CsnEGs.rst1
-rw-r--r--PCbuild/get_externals.bat4
-rw-r--r--PCbuild/python.props4
3 files changed, 5 insertions, 4 deletions
diff --git a/Misc/NEWS.d/next/Windows/2022-09-23-15-40-04.gh-issue-96965.CsnEGs.rst b/Misc/NEWS.d/next/Windows/2022-09-23-15-40-04.gh-issue-96965.CsnEGs.rst
new file mode 100644
index 0000000..de7aff0
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-09-23-15-40-04.gh-issue-96965.CsnEGs.rst
@@ -0,0 +1 @@
+Update libffi to 3.4.3
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index cd211f1..9c6bc4e 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -52,7 +52,7 @@ echo.Fetching external libraries...
set libraries=
set libraries=%libraries% bzip2-1.0.8
-if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.2
+if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.3
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1q
set libraries=%libraries% sqlite-3.38.4.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1
@@ -76,7 +76,7 @@ for %%e in (%libraries%) do (
echo.Fetching external binaries...
set binaries=
-if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.2
+if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.3
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1q
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.1
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
diff --git a/PCbuild/python.props b/PCbuild/python.props
index efcb480..c3ab12e 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -64,8 +64,8 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.38.4.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.5\</lzmaDir>
- <libffiDir>$(ExternalsDir)libffi-3.4.2\</libffiDir>
- <libffiOutDir>$(ExternalsDir)libffi-3.4.2\$(ArchName)\</libffiOutDir>
+ <libffiDir>$(ExternalsDir)libffi-3.4.3\</libffiDir>
+ <libffiOutDir>$(ExternalsDir)libffi-3.4.3\$(ArchName)\</libffiOutDir>
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
<opensslDir>$(ExternalsDir)openssl-1.1.1q\</opensslDir>
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1q\$(ArchName)\</opensslOutDir>