Fix broken recipes with missing arch.arch in get_site_packages_dir

misl6 · misl6 · commit 231d99f47731 · 2021-10-12T20:12:33.000+02:00
diff --git 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.arch),
             env['BUILDLIB_PATH'],
         ])
         env['LDFLAGS'] += ' -L{}'.format(self.ctx.python_recipe.link_root(arch.arch))
diff --git 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.arch),
             'numpy', 'core', 'include',
         )
 
diff --git 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.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
@@ -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.arch), 'google', '__init__.py'),
             'a',
         ).close()
 
diff --git 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.arch),
             env['BUILDLIB_PATH'],
         ])
         return env
diff --git 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.arch))
             self.install_python_package(arch)
 
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):`
`132`	`132`	`# the matplotlib script where to find our numpy without importing it`
`133`	`133`	`# (which will fail, because numpy isn't installed in our hostpython)`
`134`	`134`	`env['NUMPY_INCLUDES'] = join(`
`135`		`- self.ctx.get_site_packages_dir(),`
	`135`	`+ self.ctx.get_site_packages_dir(arch.arch),`
`136`	`136`	`'numpy', 'core', 'include',`
`137`	`137`	`)`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ def build_arch(self, arch):`
`26`	`26`	`)`
`27`	`27`	# the library could be `_crypto_sign.cpython-37m-x86_64-linux-gnu.so`
`28`	`28`	# or simply `_crypto_sign.so` depending on the platform/distribution
`29`		`- sh.cp('-a', sh.glob('_crypto_sign*.so'), self.ctx.get_site_packages_dir())`
	`29`	`+ sh.cp('-a', sh.glob('_crypto_sign*.so'), self.ctx.get_site_packages_dir(arch.arch))`
`30`	`30`	`self.install_python_package(arch)`
`31`	`31`
`32`	`32`