Fix broken recipes with missing arch.arch in get_site_packages_dir

Author: misl6

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))

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

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',
         )
 

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,

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()
 

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

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)
 
 

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):