blob: 231414fcb63d6ebda84391c0bc730a9b4c683c89 [file] [log] [blame]
Andrew Geissler90fd73c2021-03-05 15:25:55 -06001From f8f67c8d5c3f374b1e30e2d40cb56a79f0544471 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---
Andrew Geissler90fd73c2021-03-05 15:25:55 -060015 mesonbuild/modules/python.py | 6 +++---
16 1 file changed, 3 insertions(+), 3 deletions(-)
Brad Bishopc342db32019-05-15 21:57:59 -040017
18diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
Andrew Geissler90fd73c2021-03-05 15:25:55 -060019index eda70ce..18edd15 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 Geissler90fd73c2021-03-05 15:25:55 -060031@@ -280,8 +280,8 @@ class PythonInstallation(ExternalProgramHolder):
Brad Bishopc342db32019-05-15 21:57:59 -040032 self.variables = info['variables']
33 self.paths = info['paths']
34 install_paths = info['install_paths']
35- self.platlib_install_path = os.path.join(prefix, install_paths['platlib'][1:])
36- self.purelib_install_path = os.path.join(prefix, install_paths['purelib'][1:])
37+ self.platlib_install_path = install_paths['platlib']
38+ self.purelib_install_path = install_paths['purelib']
39 self.version = info['version']
40 self.platform = info['platform']
41 self.is_pypy = info['is_pypy']