diff --git a/docs/project/changelog.md b/docs/project/changelog.md index 68b4ccedc66..6774939defc 100644 --- a/docs/project/changelog.md +++ b/docs/project/changelog.md @@ -118,6 +118,7 @@ myst: - Upgraded `tree-sitter-python` to 0.23.4 {pr}`5185` - Upgraded `lakers-python` to 0.4.1 {pr}`5225` - Upgraded `pure-eval` to 0.2.3 {pr}`5086`, {pr}`5244` +- Upgraded `cffi` to 1.17.1 {pr}`5261` ## Version 0.26.4 diff --git a/packages/cffi/meta.yaml b/packages/cffi/meta.yaml index a3b87ad68be..5f58139583e 100644 --- a/packages/cffi/meta.yaml +++ b/packages/cffi/meta.yaml @@ -1,16 +1,14 @@ package: name: cffi - version: 1.16.0 + version: 1.17.1 top-level: - cffi requirements: run: - pycparser source: - url: https://files.pythonhosted.org/packages/68/ce/95b0bae7968c65473e1298efb042e10cafc7bafc14d9e4f154008241c91d/cffi-1.16.0.tar.gz - sha256: bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0 - patches: - - patches/0001-Use-libffi-in-emscripten.patch + url: https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz + sha256: 1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824 build: cross-build-env: true about: diff --git a/packages/cffi/patches/0001-Use-libffi-in-emscripten.patch b/packages/cffi/patches/0001-Use-libffi-in-emscripten.patch deleted file mode 100644 index bc8605fd485..00000000000 --- a/packages/cffi/patches/0001-Use-libffi-in-emscripten.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d23eff39a97bc172e6c175d944553411a1514c56 Mon Sep 17 00:00:00 2001 -From: Hood Chatham -Date: Mon, 29 Jan 2024 15:35:52 -0800 -Subject: [PATCH] Use libffi in emscripten - -Upstreamed: -https://github.com/python-cffi/cffi/pull/53 - ---- - src/c/_cffi_backend.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/c/_cffi_backend.c b/src/c/_cffi_backend.c -index 537271fb..93c9cb29 100644 ---- a/src/c/_cffi_backend.c -+++ b/src/c/_cffi_backend.c -@@ -112,6 +112,15 @@ - # define CFFI_CHECK_FFI_PREP_CIF_VAR __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) - # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 1 - -+#elif defined(__EMSCRIPTEN__) -+ -+# define CFFI_CHECK_FFI_CLOSURE_ALLOC 1 -+# define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1 -+# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC 1 -+# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC_MAYBE 1 -+# define CFFI_CHECK_FFI_PREP_CIF_VAR 1 -+# define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 1 -+ - #else - - # define CFFI_CHECK_FFI_CLOSURE_ALLOC 0 --- -2.25.1 -