summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch')
-rw-r--r--meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch14
1 files changed, 5 insertions, 9 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch b/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
index c0ad01e9d3..231414fcb6 100644
--- a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
+++ b/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
@@ -1,4 +1,4 @@
1From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001 1From f8f67c8d5c3f374b1e30e2d40cb56a79f0544471 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 18 Apr 2019 17:36:11 +0200 3Date: Thu, 18 Apr 2019 17:36:11 +0200
4Subject: [PATCH] modules/python.py: do not substitute python's install prefix 4Subject: [PATCH] modules/python.py: do not substitute python's install prefix
@@ -12,11 +12,11 @@ Upstream-Status: Pending
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 13
14--- 14---
15 mesonbuild/modules/python.py | 7 +++---- 15 mesonbuild/modules/python.py | 6 +++---
16 1 file changed, 3 insertions(+), 4 deletions(-) 16 1 file changed, 3 insertions(+), 3 deletions(-)
17 17
18diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py 18diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
19index 2f0c644..d2aa565 100644 19index eda70ce..18edd15 100644
20--- a/mesonbuild/modules/python.py 20--- a/mesonbuild/modules/python.py
21+++ b/mesonbuild/modules/python.py 21+++ b/mesonbuild/modules/python.py
22@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig 22@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
@@ -28,11 +28,7 @@ index 2f0c644..d2aa565 100644
28 28
29 def links_against_libpython(): 29 def links_against_libpython():
30 from distutils.core import Distribution, Extension 30 from distutils.core import Distribution, Extension
31@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder): 31@@ -280,8 +280,8 @@ class PythonInstallation(ExternalProgramHolder):
32 ExternalProgramHolder.__init__(self, python, interpreter.subproject)
33 self.interpreter = interpreter
34 self.subproject = self.interpreter.subproject
35- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
36 self.variables = info['variables'] 32 self.variables = info['variables']
37 self.paths = info['paths'] 33 self.paths = info['paths']
38 install_paths = info['install_paths'] 34 install_paths = info['install_paths']