diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2024-02-16 13:11:37 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2024-02-16 13:55:06 +0530 |
| commit | ad37405f6e9ca628dc9e0828daf5cef7a0cbcb97 (patch) | |
| tree | 6b441862d07cdccdcaa0453b29176a08e8b5cccc | |
| parent | 14abc57bfd2213fa9386345118dc2b5cf139e08d (diff) | |
meson.recipe: Install using the venv python.exe
Fixes https://gitlab.freedesktop.org/gstreamer/cerbero/-/issues/469
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1373>
| -rw-r--r-- | recipes/build-tools/meson.recipe | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/recipes/build-tools/meson.recipe b/recipes/build-tools/meson.recipe index 584cc8ae..038f8721 100644 --- a/recipes/build-tools/meson.recipe +++ b/recipes/build-tools/meson.recipe @@ -29,17 +29,8 @@ class Recipe(recipe.Recipe): prefix = str(PurePath(self.config.prefix)) else: prefix = self.config.prefix - # Some distros have changed the default sysconfig scheme to - # manually add 'local' to all install dirs for setuptools. - # Reverting this is far too much work and will be fragile as heck, - # so just accept it and move on. - # Fedora: https://src.fedoraproject.org/rpms/python3.10/blob/f36/f/00251-change-user-install-location.patch - # Debian: https://salsa.debian.org/cpython-team/python3/-/blob/3.10.4-4/debian/patches/sysconfig-debian-schemes.diff - # - # Our workaround is to only install the script into bin. This also - # fixes things on Windows, where the script is installed into Scripts/ - # instead of bin/ - await shell.async_call([self.config.python_exe, '-m', 'pip', 'install', '--prefix', prefix, '.'], + python_exe = os.path.join(self.config.build_tools_prefix, 'bin', 'python') + await shell.async_call([python_exe, '-m', 'pip', 'install', '--prefix', prefix, '.'], cmd_dir=self.build_dir, env=self.env, logfile=self.logfile) if self.config.platform == Platform.WINDOWS: # Python insists on using Scripts instead of bin on Windows for |