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.patch11
1 files changed, 6 insertions, 5 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 a25c392270..c0ad01e9d3 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 1d178fb2928d325e339b15972890ceced863d3ec Mon Sep 17 00:00:00 2001 1From 214e559d394491b1376e4cc370f75151117a3f83 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
@@ -10,15 +10,16 @@ b) shouldn't be necessary as Python's prefix ought to be correct in the first pl
10 10
11Upstream-Status: Pending 11Upstream-Status: Pending
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13
13--- 14---
14 mesonbuild/modules/python.py | 7 +++---- 15 mesonbuild/modules/python.py | 7 +++----
15 1 file changed, 3 insertions(+), 4 deletions(-) 16 1 file changed, 3 insertions(+), 4 deletions(-)
16 17
17diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py 18diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
18index 6e2c63b..f5a37ac 100644 19index 2f0c644..d2aa565 100644
19--- a/mesonbuild/modules/python.py 20--- a/mesonbuild/modules/python.py
20+++ b/mesonbuild/modules/python.py 21+++ b/mesonbuild/modules/python.py
21@@ -254,7 +254,7 @@ import sysconfig 22@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
22 import json 23 import json
23 import sys 24 import sys
24 25
@@ -27,8 +28,8 @@ index 6e2c63b..f5a37ac 100644
27 28
28 def links_against_libpython(): 29 def links_against_libpython():
29 from distutils.core import Distribution, Extension 30 from distutils.core import Distribution, Extension
30@@ -279,12 +279,11 @@ class PythonInstallation(ExternalProgramHolder): 31@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
31 ExternalProgramHolder.__init__(self, python) 32 ExternalProgramHolder.__init__(self, python, interpreter.subproject)
32 self.interpreter = interpreter 33 self.interpreter = interpreter
33 self.subproject = self.interpreter.subproject 34 self.subproject = self.interpreter.subproject
34- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix') 35- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')