From 717d3805b250ce653f61e1d98c2d5b1c61f6d057 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 2 Dec 2022 22:23:33 -0500 Subject: [PATCH] supply arch.arch to get_python_install_dir() --- p4a/pythonforandroid/bootstraps/lbry/__init__.py | 2 +- recipes/coincurve/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/p4a/pythonforandroid/bootstraps/lbry/__init__.py b/p4a/pythonforandroid/bootstraps/lbry/__init__.py index f3fbeed..77835ba 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/__init__.py +++ b/p4a/pythonforandroid/bootstraps/lbry/__init__.py @@ -18,7 +18,7 @@ class LbryBootstrap(Bootstrap): info_main("# Creating Android project ({})".format(self.name)) arch = self.ctx.archs[0] - python_install_dir = self.ctx.get_python_install_dir() + python_install_dir = self.ctx.get_python_install_dir(arch.arch) #from_crystax = self.ctx.python_recipe.from_crystax #crystax_python_dir = join("crystax_python", "crystax_python") diff --git a/recipes/coincurve/__init__.py b/recipes/coincurve/__init__.py index 36be458..e3da419 100644 --- a/recipes/coincurve/__init__.py +++ b/recipes/coincurve/__init__.py @@ -31,7 +31,7 @@ class CoincurveRecipe(CompiledComponentsPythonRecipe): # https://github.com/kivy/python-for-android/pull/1250/files#diff-569e13021e33ced8b54385f55b49cbe6 env['CFLAGS'] += ' -I{}/include/python/'.format(ndk_dir_python) else: - env['PYTHON_ROOT'] = self.ctx.get_python_install_dir() + env['PYTHON_ROOT'] = self.ctx.get_python_install_dir(arch.arch) env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python{}'.format(python_version) env['LDFLAGS'] += " -lpython{}".format(python_version) env['LDFLAGS'] += " -lsecp256k1"