Skip to content

Commit 5df11be

Browse files
HyTurtleSomberNight
authored andcommitted
Update cffi recipe for Python 3.10 (kivy#2800)
* Update __init__.py version bump to 1.15.1 * Update disable-pkg-config.patch adjust patch for 1.15.1
1 parent 04e8008 commit 5df11be

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

pythonforandroid/recipes/cffi/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CffiRecipe(CompiledComponentsPythonRecipe):
77
Extra system dependencies: autoconf, automake and libtool.
88
"""
99
name = 'cffi'
10-
version = '1.13.2'
10+
version = '1.15.1'
1111
url = 'https://pypi.python.org/packages/source/c/cffi/cffi-{version}.tar.gz'
1212

1313
depends = ['setuptools', 'pycparser', 'libffi']
Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
diff --git a/setup.py b/setup.py
2-
index c1db368..57311c3 100644
1+
diff --git a/setup.py b/setup copy.py
2+
index 4ce0007..9be4a6d 100644
33
--- a/setup.py
4-
+++ b/setup.py
5-
@@ -5,8 +5,7 @@ import errno
4+
+++ b/setup
5+
@@ -9,8 +9,7 @@ if sys.platform == "win32":
66

77
sources = ['c/_cffi_backend.c']
88
libraries = ['ffi']
99
-include_dirs = ['/usr/include/ffi',
1010
- '/usr/include/libffi'] # may be changed by pkg-config
11-
+include_dirs = os.environ['FFI_INC'].split(",") if 'FFI_INC' in os.environ else []
12-
define_macros = []
11+
+include_dirs = os.environ['FFI_INC'].split(',') if 'FFI_INC' in os.environ else []
12+
define_macros = [('FFI_BUILDING', '1')] # for linking with libffi static library
1313
library_dirs = []
1414
extra_compile_args = []
15-
@@ -67,14 +66,7 @@ def ask_supports_thread():
16-
sys.stderr.write("The above error message can be safely ignored\n")
15+
@@ -105,14 +104,7 @@ def uses_msvc():
16+
return config.try_compile('#ifndef _MSC_VER\n#error "not MSVC"\n#endif')
1717

1818
def use_pkg_config():
1919
- if sys.platform == 'darwin' and os.path.exists('/usr/local/bin/brew'):
@@ -25,6 +25,4 @@ index c1db368..57311c3 100644
2525
- _ask_pkg_config(extra_link_args, '--libs-only-other')
2626
- _ask_pkg_config(libraries, '--libs-only-l', '-l')
2727
+ pass
28-
29-
def use_homebrew_for_libffi():
30-
# We can build by setting:
28+

0 commit comments

Comments
 (0)