diff --git a/cpython-unix/build-libffi.sh b/cpython-unix/build-libffi.sh index 33cc3d9b..7a50589e 100755 --- a/cpython-unix/build-libffi.sh +++ b/cpython-unix/build-libffi.sh @@ -13,40 +13,6 @@ tar -xf libffi-${LIBFFI_VERSION}.tar.gz pushd libffi-${LIBFFI_VERSION} -# Upstream commit ce077e5565366171aa1b4438749b0922fce887a4 to resolve a missing declaration. -patch -p1 << 'EOF' -diff --git a/include/ffi_common.h b/include/ffi_common.h -index 2bd31b0..c53a794 100644 ---- a/include/ffi_common.h -+++ b/include/ffi_common.h -@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; - static trampoline. */ - int ffi_tramp_is_present (void *closure) FFI_HIDDEN; - -+/* Return a file descriptor of a temporary zero-sized file in a -+ writable and executable filesystem. */ -+int open_temp_exec_file(void) FFI_HIDDEN; -+ - /* Extended cif, used in callback from assembly routine */ - typedef struct - { -diff --git a/src/tramp.c b/src/tramp.c -index 7e005b0..5f19b55 100644 ---- a/src/tramp.c -+++ b/src/tramp.c -@@ -39,6 +39,10 @@ - #ifdef __linux__ - #define _GNU_SOURCE 1 - #endif -+ -+#include -+#include -+ - #include - #include - #include -EOF - EXTRA_CONFIGURE= # mkostemp() was introduced in macOS 10.10 and libffi doesn't have diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py index 344e6cb4..4c669a8f 100644 --- a/pythonbuild/downloads.py +++ b/pythonbuild/downloads.py @@ -126,10 +126,10 @@ "license_file": "LICENSE.libffi.txt", }, "libffi": { - "url": "https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz", - "size": 1362394, - "sha256": "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676", - "version": "3.4.4", + "url": "https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz", + "size": 1391684, + "sha256": "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e", + "version": "3.4.6", "library_names": ["ffi"], "licenses": ["MIT"], "license_file": "LICENSE.libffi.txt",