Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

recipes: scipy - fix build for armeabi-v7a #2402

Merged
merged 2 commits into from
Jan 6, 2021
Merged

recipes: scipy - fix build for armeabi-v7a #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b861dcf
fix for armeabi-v7a
mzakharo Jan 6, 2021
78459ac
move comment to docstring
mzakharo Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pythonforandroid/recipes/lapack/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
'''
known to build with cmake version 3.19.2 and NDK r19c.
See https://gitlab.kitware.com/cmake/cmake/-/issues/18739
'''

from pythonforandroid.recipe import Recipe
from pythonforandroid.logger import shprint
from pythonforandroid.util import current_directory, ensure_dir, BuildInterruptingException
Expand Down
4 changes: 3 additions & 1 deletion pythonforandroid/recipes/scipy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def get_recipe_env(self, arch):

GCC_VER = '4.9'
HOST = 'linux-x86_64'
LIB = 'lib64'
LIB = 'lib64' if '64' in arch.arch else 'lib'

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

return env


Expand Down