diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/builddir.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/builddir.patch | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/meta/recipes-devtools/python/python/builddir.patch b/meta/recipes-devtools/python/python/builddir.patch index 930170b95a..ad629a022e 100644 --- a/meta/recipes-devtools/python/python/builddir.patch +++ b/meta/recipes-devtools/python/python/builddir.patch | |||
@@ -7,11 +7,11 @@ python recipe. | |||
7 | Upstream-Status: Inappropriate | 7 | Upstream-Status: Inappropriate |
8 | RP 2012/11/13 | 8 | RP 2012/11/13 |
9 | 9 | ||
10 | Index: Python-2.7.3/Lib/sysconfig.py | 10 | Index: Python-2.7.9/Lib/sysconfig.py |
11 | =================================================================== | 11 | =================================================================== |
12 | --- Python-2.7.3.orig/Lib/sysconfig.py 2012-11-13 14:36:08.429167199 +0000 | 12 | --- Python-2.7.9.orig/Lib/sysconfig.py |
13 | +++ Python-2.7.3/Lib/sysconfig.py 2012-11-13 21:58:31.788551800 +0000 | 13 | +++ Python-2.7.9/Lib/sysconfig.py |
14 | @@ -93,6 +93,7 @@ | 14 | @@ -93,6 +93,7 @@ _PREFIX = os.path.normpath(sys.prefix) |
15 | _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) | 15 | _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) |
16 | _CONFIG_VARS = None | 16 | _CONFIG_VARS = None |
17 | _USER_BASE = None | 17 | _USER_BASE = None |
@@ -19,7 +19,7 @@ Index: Python-2.7.3/Lib/sysconfig.py | |||
19 | 19 | ||
20 | def _safe_realpath(path): | 20 | def _safe_realpath(path): |
21 | try: | 21 | try: |
22 | @@ -100,7 +102,9 @@ | 22 | @@ -100,7 +101,9 @@ def _safe_realpath(path): |
23 | except OSError: | 23 | except OSError: |
24 | return path | 24 | return path |
25 | 25 | ||
@@ -30,11 +30,11 @@ Index: Python-2.7.3/Lib/sysconfig.py | |||
30 | _PROJECT_BASE = os.path.dirname(_safe_realpath(sys.executable)) | 30 | _PROJECT_BASE = os.path.dirname(_safe_realpath(sys.executable)) |
31 | else: | 31 | else: |
32 | # sys.executable can be empty if argv[0] has been changed and Python is | 32 | # sys.executable can be empty if argv[0] has been changed and Python is |
33 | Index: Python-2.7.3/Lib/distutils/sysconfig.py | 33 | Index: Python-2.7.9/Lib/distutils/sysconfig.py |
34 | =================================================================== | 34 | =================================================================== |
35 | --- Python-2.7.3.orig/Lib/distutils/sysconfig.py 2012-11-13 14:36:08.005167209 +0000 | 35 | --- Python-2.7.9.orig/Lib/distutils/sysconfig.py |
36 | +++ Python-2.7.3/Lib/distutils/sysconfig.py 2012-11-13 22:07:05.644540695 +0000 | 36 | +++ Python-2.7.9/Lib/distutils/sysconfig.py |
37 | @@ -26,6 +26,9 @@ | 37 | @@ -26,6 +26,9 @@ EXEC_PREFIX = os.path.normpath(sys.exec_ |
38 | # live in project/PCBuild9. If we're dealing with an x64 Windows build, | 38 | # live in project/PCBuild9. If we're dealing with an x64 Windows build, |
39 | # it'll live in project/PCbuild/amd64. | 39 | # it'll live in project/PCbuild/amd64. |
40 | project_base = os.path.dirname(os.path.abspath(sys.executable)) | 40 | project_base = os.path.dirname(os.path.abspath(sys.executable)) |
@@ -44,12 +44,3 @@ Index: Python-2.7.3/Lib/distutils/sysconfig.py | |||
44 | if os.name == "nt" and "pcbuild" in project_base[-8:].lower(): | 44 | if os.name == "nt" and "pcbuild" in project_base[-8:].lower(): |
45 | project_base = os.path.abspath(os.path.join(project_base, os.path.pardir)) | 45 | project_base = os.path.abspath(os.path.join(project_base, os.path.pardir)) |
46 | # PC/VS7.1 | 46 | # PC/VS7.1 |
47 | @@ -247,7 +250,7 @@ | ||
48 | def get_makefile_filename(): | ||
49 | """Return full pathname of installed Makefile from the Python build.""" | ||
50 | if python_build: | ||
51 | - return os.path.join(os.path.dirname(sys.executable), "Makefile") | ||
52 | + return os.path.join(project_base, "Makefile") | ||
53 | lib_dir = get_python_lib(plat_specific=1, standard_lib=1) | ||
54 | return os.path.join(lib_dir, "config", "Makefile") | ||
55 | |||