Skip to content

Commit 9bfc3bc

Browse files
mzakharovesellov
authored andcommitted
recipes: scipy - fix build for armeabi-v7a (kivy#2402)
* fix for armeabi-v7a * move comment to docstring
1 parent 9234e69 commit 9bfc3bc

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

pythonforandroid/recipes/lapack/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
'''
2+
known to build with cmake version 3.19.2 and NDK r19c.
3+
See https://gitlab.kitware.com/cmake/cmake/-/issues/18739
4+
'''
5+
16
from pythonforandroid.recipe import Recipe
27
from pythonforandroid.logger import shprint
38
from pythonforandroid.util import current_directory, ensure_dir, BuildInterruptingException

pythonforandroid/recipes/scipy/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def get_recipe_env(self, arch):
2626

2727
GCC_VER = '4.9'
2828
HOST = 'linux-x86_64'
29-
LIB = 'lib64'
29+
LIB = 'lib64' if '64' in arch.arch else 'lib'
3030

3131
prefix = env['TOOLCHAIN_PREFIX']
3232
lapack_dir = join(Recipe.get_recipe('lapack', self.ctx).get_build_dir(arch.arch), 'build', 'install')
@@ -43,6 +43,8 @@ def get_recipe_env(self, arch):
4343
env['CPPFLAGS'] += f' --sysroot={sysroot} -I{sysroot_include}/c++/v1 -I{sysroot_include}'
4444
env['LDSHARED'] = 'clang'
4545
env['LDFLAGS'] += f' {LDSHARED_opts} --sysroot={sysroot} -L{libgfortran} -L{numpylib}'
46+
env['LDFLAGS'] += f' -L{self.ctx.ndk_dir}/sources/cxx-stl/llvm-libc++/libs/{arch.arch}/'
47+
4648
return env
4749

4850

0 commit comments

Comments
 (0)