pyrox.dev
Merge #280546: python3Packages.cffi: fix missing ffi_prep_closure_loc() on macos < 10.15
...into staging
+9
-2
pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff
+9
-2
pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff
···
2
2
index 537271f..9c3bf94 100644
3
3
--- a/src/c/_cffi_backend.c
4
4
+++ b/src/c/_cffi_backend.c
5
-
@@ -103,7 +103,7 @@
5
+
@@ -103,11 +103,11 @@
6
6
# define CFFI_CHECK_FFI_PREP_CIF_VAR 0
7
7
# define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 0
8
8
9
9
-#elif defined(__APPLE__) && defined(FFI_AVAILABLE_APPLE)
10
10
+#elif defined(__APPLE__)
11
11
12
-
# define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *)
12
+
-# define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *)
13
+
+# define CFFI_CHECK_FFI_CLOSURE_ALLOC 1
13
14
# define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1
15
+
-# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *)
16
+
+# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC 1
17
+
# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC_MAYBE 1
18
+
-# define CFFI_CHECK_FFI_PREP_CIF_VAR __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *)
19
+
+# define CFFI_CHECK_FFI_PREP_CIF_VAR 1
20
+
# define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 1
14
21
@@ -6422,7 +6422,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args)
15
22
else
16
23
#endif