diff --git a/ci/constants.py b/ci/constants.py index 8d62c83feb..f794bc68b9 100644 --- a/ci/constants.py +++ b/ci/constants.py @@ -28,6 +28,10 @@ class TargetPython(Enum): 'vlc', # need extra gfortran NDK system add-on 'lapack', 'scipy', + # Outdated and there's a chance that is now useless. + 'zope_interface', + # Requires zope_interface, which is broken. + 'twisted', ]) BROKEN_RECIPES = { diff --git a/pythonforandroid/recipes/cffi/__init__.py b/pythonforandroid/recipes/cffi/__init__.py index 06966e0138..0b12c1af5b 100644 --- a/pythonforandroid/recipes/cffi/__init__.py +++ b/pythonforandroid/recipes/cffi/__init__.py @@ -37,7 +37,7 @@ def get_recipe_env(self, arch=None): # required for libc and libdl env['LDFLAGS'] += ' -L{}'.format(arch.ndk_lib_dir) env['PYTHONPATH'] = ':'.join([ - self.ctx.get_site_packages_dir(), + self.ctx.get_site_packages_dir(arch), env['BUILDLIB_PATH'], ]) env['LDFLAGS'] += ' -L{}'.format(self.ctx.python_recipe.link_root(arch.arch)) diff --git a/pythonforandroid/recipes/libtorrent/__init__.py b/pythonforandroid/recipes/libtorrent/__init__.py index b9debc2175..24f94081c6 100644 --- a/pythonforandroid/recipes/libtorrent/__init__.py +++ b/pythonforandroid/recipes/libtorrent/__init__.py @@ -132,7 +132,7 @@ def build_arch(self, arch): python_libtorrent = get_lib_from(join(build_dir, 'bindings/python/bin')) shutil.copyfile(python_libtorrent, - join(self.ctx.get_site_packages_dir(arch.arch), 'libtorrent.so')) + join(self.ctx.get_site_packages_dir(arch), 'libtorrent.so')) def get_recipe_env(self, arch): # Use environment from boost recipe, cause we use b2 tool from boost diff --git a/pythonforandroid/recipes/matplotlib/__init__.py b/pythonforandroid/recipes/matplotlib/__init__.py index 2a7d5c37ee..57e5755761 100644 --- a/pythonforandroid/recipes/matplotlib/__init__.py +++ b/pythonforandroid/recipes/matplotlib/__init__.py @@ -132,7 +132,7 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True): # the matplotlib script where to find our numpy without importing it # (which will fail, because numpy isn't installed in our hostpython) env['NUMPY_INCLUDES'] = join( - self.ctx.get_site_packages_dir(), + self.ctx.get_site_packages_dir(arch), 'numpy', 'core', 'include', ) diff --git a/pythonforandroid/recipes/opencv/__init__.py b/pythonforandroid/recipes/opencv/__init__.py index 65b53efcc8..c760cbdda7 100644 --- a/pythonforandroid/recipes/opencv/__init__.py +++ b/pythonforandroid/recipes/opencv/__init__.py @@ -61,7 +61,7 @@ def build_arch(self, arch): python_major = self.ctx.python_recipe.version[0] python_include_root = self.ctx.python_recipe.include_root(arch.arch) - python_site_packages = self.ctx.get_site_packages_dir() + python_site_packages = self.ctx.get_site_packages_dir(arch) python_link_root = self.ctx.python_recipe.link_root(arch.arch) python_link_version = self.ctx.python_recipe.link_version python_library = join(python_link_root, diff --git a/pythonforandroid/recipes/protobuf_cpp/__init__.py b/pythonforandroid/recipes/protobuf_cpp/__init__.py index 5c43e33828..c1149f2714 100644 --- a/pythonforandroid/recipes/protobuf_cpp/__init__.py +++ b/pythonforandroid/recipes/protobuf_cpp/__init__.py @@ -124,7 +124,7 @@ def install_python_package(self, arch): # - https://stackoverflow.com/questions/13862562/ # google-protocol-buffers-not-found-when-trying-to-freeze-python-app open( - join(self.ctx.get_site_packages_dir(), 'google', '__init__.py'), + join(self.ctx.get_site_packages_dir(arch), 'google', '__init__.py'), 'a', ).close() diff --git a/pythonforandroid/recipes/twisted/__init__.py b/pythonforandroid/recipes/twisted/__init__.py index 7264aad23c..0c390a5b14 100644 --- a/pythonforandroid/recipes/twisted/__init__.py +++ b/pythonforandroid/recipes/twisted/__init__.py @@ -29,7 +29,7 @@ def get_recipe_env(self, arch): env = super().get_recipe_env(arch) # We add BUILDLIB_PATH to PYTHONPATH so twisted can find _io.so env['PYTHONPATH'] = ':'.join([ - self.ctx.get_site_packages_dir(), + self.ctx.get_site_packages_dir(arch), env['BUILDLIB_PATH'], ]) return env diff --git a/pythonforandroid/recipes/xeddsa/__init__.py b/pythonforandroid/recipes/xeddsa/__init__.py index 15d9b8f1bb..d386f921c9 100644 --- a/pythonforandroid/recipes/xeddsa/__init__.py +++ b/pythonforandroid/recipes/xeddsa/__init__.py @@ -26,7 +26,7 @@ def build_arch(self, arch): ) # the library could be `_crypto_sign.cpython-37m-x86_64-linux-gnu.so` # or simply `_crypto_sign.so` depending on the platform/distribution - sh.cp('-a', sh.glob('_crypto_sign*.so'), self.ctx.get_site_packages_dir()) + sh.cp('-a', sh.glob('_crypto_sign*.so'), self.ctx.get_site_packages_dir(arch)) self.install_python_package(arch) diff --git a/pythonforandroid/recipes/zope_interface/__init__.py b/pythonforandroid/recipes/zope_interface/__init__.py index f4142a5b00..46a1820c2b 100644 --- a/pythonforandroid/recipes/zope_interface/__init__.py +++ b/pythonforandroid/recipes/zope_interface/__init__.py @@ -19,7 +19,7 @@ def build_arch(self, arch): # folders (once is installed), that leads into an ImportError. # Here we intentionally apply a patch to solve that, so, in case that # this is solved in the future an error will be triggered - zope_install = join(self.ctx.get_site_packages_dir(arch.arch), 'zope') + zope_install = join(self.ctx.get_site_packages_dir(arch), 'zope') self.apply_patch('fix-init.patch', arch.arch, build_dir=zope_install) def prebuild_arch(self, arch):