blob: c0ad01e9d3fd5088500a42dd2140cec8783dadf5 [file] [log] [blame]
Andrew Geissler635e0e42020-08-21 15:58:33 -05001From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001
Brad Bishopc342db32019-05-15 21:57:59 -04002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 18 Apr 2019 17:36:11 +0200
4Subject: [PATCH] modules/python.py: do not substitute python's install prefix
5 with meson's
6
7Not sure why this is being done, but it
8a) relies on Python's internal variable substitution which may break in the future
9b) shouldn't be necessary as Python's prefix ought to be correct in the first place
10
11Upstream-Status: Pending
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Andrew Geissler635e0e42020-08-21 15:58:33 -050013
Brad Bishopc342db32019-05-15 21:57:59 -040014---
15 mesonbuild/modules/python.py | 7 +++----
16 1 file changed, 3 insertions(+), 4 deletions(-)
17
18diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
Andrew Geissler635e0e42020-08-21 15:58:33 -050019index 2f0c644..d2aa565 100644
Brad Bishopc342db32019-05-15 21:57:59 -040020--- a/mesonbuild/modules/python.py
21+++ b/mesonbuild/modules/python.py
Andrew Geissler635e0e42020-08-21 15:58:33 -050022@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
Brad Bishopc342db32019-05-15 21:57:59 -040023 import json
24 import sys
25
26-install_paths = sysconfig.get_paths(scheme='posix_prefix', vars={'base': '', 'platbase': '', 'installed_base': ''})
27+install_paths = sysconfig.get_paths(scheme='posix_prefix')
28
29 def links_against_libpython():
30 from distutils.core import Distribution, Extension
Andrew Geissler635e0e42020-08-21 15:58:33 -050031@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
32 ExternalProgramHolder.__init__(self, python, interpreter.subproject)
Brad Bishopc342db32019-05-15 21:57:59 -040033 self.interpreter = interpreter
34 self.subproject = self.interpreter.subproject
35- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
36 self.variables = info['variables']
37 self.paths = info['paths']
38 install_paths = info['install_paths']
39- self.platlib_install_path = os.path.join(prefix, install_paths['platlib'][1:])
40- self.purelib_install_path = os.path.join(prefix, install_paths['purelib'][1:])
41+ self.platlib_install_path = install_paths['platlib']
42+ self.purelib_install_path = install_paths['purelib']
43 self.version = info['version']
44 self.platform = info['platform']
45 self.is_pypy = info['is_pypy']