Skip to content

Commit b3fb461

Browse files
committed
numpy cpowf may not be there on all platform (got an issue with RCS tablet with Android 6, cpowf was not here.)
1 parent 6549a28 commit b3fb461

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

pythonforandroid/recipes/numpy/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ class NumpyRecipe(CompiledComponentsPythonRecipe):
1616
join('patches', 'prevent_libs_check.patch'),
1717
join('patches', 'ar.patch'),
1818
join('patches', 'lib.patch'),
19-
join('patches', 'python-fixes.patch')
19+
join('patches', 'python-fixes.patch'),
20+
join('patches', 'fix-numpy-cpowf-android-6.patch')
2021
]
2122

2223
def get_recipe_env(self, arch):
@@ -40,7 +41,7 @@ def get_recipe_env(self, arch):
4041
flags += 'm'
4142

4243
if flags not in env['CC']:
43-
env['CC'] += flags
44+
env['CC'] += flags # + ' -DNPY_NO_SIGNAL'
4445
if flags not in env['LD']:
4546
env['LD'] += flags + ' -shared'
4647
return env
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/numpy/core/setup_common.py 2019-01-08 00:21:05.012501539 +0100
2+
+++ b/numpy/core/setup_common.py 2019-01-08 00:21:15.532266407 +0100
3+
@@ -189,7 +189,7 @@
4+
]
5+
C99_COMPLEX_FUNCS = [
6+
"cabs", "cacos", "cacosh", "carg", "casin", "casinh", "catan",
7+
- "catanh", "ccos", "ccosh", "cexp", "cimag", "clog", "conj", "cpow",
8+
+ "catanh", "ccos", "ccosh", "cexp", "cimag", "clog", "conj",
9+
"cproj", "creal", "csin", "csinh", "csqrt", "ctan", "ctanh"
10+
]

0 commit comments

Comments
 (0)