Skip to content

Commit ea4413d

Browse files
committed
downloads: libffi 3.4.4 -> 3.4.6
This release incorporates the path we were applying manually. So stop applying it.
1 parent 4d0ef05 commit ea4413d

File tree

2 files changed

+4
-38
lines changed

2 files changed

+4
-38
lines changed

cpython-unix/build-libffi.sh

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,6 @@ tar -xf libffi-${LIBFFI_VERSION}.tar.gz
1313

1414
pushd libffi-${LIBFFI_VERSION}
1515

16-
# Upstream commit ce077e5565366171aa1b4438749b0922fce887a4 to resolve a missing declaration.
17-
patch -p1 << 'EOF'
18-
diff --git a/include/ffi_common.h b/include/ffi_common.h
19-
index 2bd31b0..c53a794 100644
20-
--- a/include/ffi_common.h
21-
+++ b/include/ffi_common.h
22-
@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN;
23-
static trampoline. */
24-
int ffi_tramp_is_present (void *closure) FFI_HIDDEN;
25-
26-
+/* Return a file descriptor of a temporary zero-sized file in a
27-
+ writable and executable filesystem. */
28-
+int open_temp_exec_file(void) FFI_HIDDEN;
29-
+
30-
/* Extended cif, used in callback from assembly routine */
31-
typedef struct
32-
{
33-
diff --git a/src/tramp.c b/src/tramp.c
34-
index 7e005b0..5f19b55 100644
35-
--- a/src/tramp.c
36-
+++ b/src/tramp.c
37-
@@ -39,6 +39,10 @@
38-
#ifdef __linux__
39-
#define _GNU_SOURCE 1
40-
#endif
41-
+
42-
+#include <ffi.h>
43-
+#include <ffi_common.h>
44-
+
45-
#include <stdio.h>
46-
#include <unistd.h>
47-
#include <stdlib.h>
48-
EOF
49-
5016
EXTRA_CONFIGURE=
5117

5218
# mkostemp() was introduced in macOS 10.10 and libffi doesn't have

pythonbuild/downloads.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@
126126
"license_file": "LICENSE.libffi.txt",
127127
},
128128
"libffi": {
129-
"url": "https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz",
130-
"size": 1362394,
131-
"sha256": "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676",
132-
"version": "3.4.4",
129+
"url": "https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz",
130+
"size": 1391684,
131+
"sha256": "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e",
132+
"version": "3.4.6",
133133
"library_names": ["ffi"],
134134
"licenses": ["MIT"],
135135
"license_file": "LICENSE.libffi.txt",

0 commit comments

Comments
 (0)