| From f8f67c8d5c3f374b1e30e2d40cb56a79f0544471 Mon Sep 17 00:00:00 2001 |
| From: Alexander Kanavin <alex.kanavin@gmail.com> |
| Date: Thu, 18 Apr 2019 17:36:11 +0200 |
| Subject: [PATCH] modules/python.py: do not substitute python's install prefix |
| with meson's |
| |
| Not sure why this is being done, but it |
| a) relies on Python's internal variable substitution which may break in the future |
| b) shouldn't be necessary as Python's prefix ought to be correct in the first place |
| |
| Upstream-Status: Pending |
| Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| |
| --- |
| mesonbuild/modules/python.py | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py |
| index eda70ce..18edd15 100644 |
| --- a/mesonbuild/modules/python.py |
| +++ b/mesonbuild/modules/python.py |
| @@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig |
| import json |
| import sys |
| |
| -install_paths = sysconfig.get_paths(scheme='posix_prefix', vars={'base': '', 'platbase': '', 'installed_base': ''}) |
| +install_paths = sysconfig.get_paths(scheme='posix_prefix') |
| |
| def links_against_libpython(): |
| from distutils.core import Distribution, Extension |
| @@ -280,8 +280,8 @@ class PythonInstallation(ExternalProgramHolder): |
| self.variables = info['variables'] |
| self.paths = info['paths'] |
| install_paths = info['install_paths'] |
| - self.platlib_install_path = os.path.join(prefix, install_paths['platlib'][1:]) |
| - self.purelib_install_path = os.path.join(prefix, install_paths['purelib'][1:]) |
| + self.platlib_install_path = install_paths['platlib'] |
| + self.purelib_install_path = install_paths['purelib'] |
| self.version = info['version'] |
| self.platform = info['platform'] |
| self.is_pypy = info['is_pypy'] |