Skip to content

Commit 7cfbd19

Browse files
committed
kivy#3305 + fixed build libopenblas
1 parent fb85205 commit 7cfbd19

2 files changed

Lines changed: 15 additions & 3 deletions

File tree

pythonforandroid/recipes/libopenblas/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ def build_arch(self, arch):
3030
"-DCMAKE_ANDROID_ARCH_ABI={arch}".format(arch=arch.arch),
3131
"-DCMAKE_ANDROID_NDK=" + self.ctx.ndk_dir,
3232
"-DCMAKE_ANDROID_API={api}".format(api=self.ctx.ndk_api),
33+
"-DCMAKE_Fortran_COMPILER=NOTFOUND",
3334
"-DCMAKE_BUILD_TYPE=Release",
3435
"-DBUILD_SHARED_LIBS=ON",
3536
"-DC_LAPACK=ON",
37+
"-DDYNAMIC_ARCH=0",
3638
"-DTARGET={target}".format(
3739
target={
3840
"arm64-v8a": "ARMV8",
@@ -47,4 +49,4 @@ def build_arch(self, arch):
4749
shprint(sh.make, "-j" + str(cpu_count()), _env=env)
4850

4951

50-
recipe = LibOpenBlasRecipe()
52+
recipe = LibOpenBlasRecipe()

pythonforandroid/recipes/numpy/__init__.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@
1010
class NumpyRecipe(MesonRecipe):
1111
version = "v2.3.0"
1212
url = "git+https://github.com/numpy/numpy"
13-
extra_build_args = ["-Csetup-args=-Dblas=none", "-Csetup-args=-Dlapack=none"]
13+
depends = ["libopenblas"]
14+
extra_build_args = [
15+
"-Csetup-args=-Dblas=auto",
16+
"-Csetup-args=-Dlapack=auto",
17+
"-Csetup-args=-Dallow-noblas=False",
18+
]
1419
need_stl_shared = True
1520
min_ndk_api_support = 24
1621

@@ -41,6 +46,11 @@ def get_recipe_env(self, arch, **kwargs):
4146
"android-build",
4247
"python",
4348
)
49+
blas_dir = join(Recipe.get_recipe("libopenblas", self.ctx
50+
).get_build_dir(arch.arch), "build")
51+
blas_incdir = blas_dir
52+
blas_libdir = join(blas_dir, "lib")
53+
env["CXXFLAGS"] += f" -I{blas_incdir} -L{blas_libdir}"
4454
return env
4555

4656
def get_hostrecipe_env(self, arch=None):
@@ -49,4 +59,4 @@ def get_hostrecipe_env(self, arch=None):
4959
return env
5060

5161

52-
recipe = NumpyRecipe()
62+
recipe = NumpyRecipe()

0 commit comments

Comments
 (0)