diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch deleted file mode 100644 index bbdd8b586e..0000000000 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From 843574d5a5b0818e83e20f8c0389d567bd4733fb Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 14 May 2013 15:00:26 -0700 | ||
4 | Subject: [PATCH] python3: Add target and native recipes | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded specific] | ||
7 | |||
8 | 02/2015 Rebased for Python 3.4.2 | ||
9 | |||
10 | The proper prefix is inside our staging area. | ||
11 | Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> | ||
12 | Signed-off-by: Phil Blundell <philb@gnu.org> | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
15 | |||
16 | --- | ||
17 | Lib/distutils/sysconfig.py | 14 +++++++++++--- | ||
18 | 1 file changed, 11 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py | ||
21 | index 03b8558..57d193d 100644 | ||
22 | --- a/Lib/distutils/sysconfig.py | ||
23 | +++ b/Lib/distutils/sysconfig.py | ||
24 | @@ -272,7 +272,9 @@ def get_python_inc(plat_specific=0, prefix=None): | ||
25 | If 'prefix' is supplied, use it instead of sys.base_prefix or | ||
26 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. | ||
27 | """ | ||
28 | - if prefix is None: | ||
29 | + if prefix is None and os.environ.get('STAGING_INCDIR', ""): | ||
30 | + prefix = os.environ['STAGING_INCDIR'].rstrip('include') | ||
31 | + elif prefix is None: | ||
32 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX | ||
33 | if os.name == "posix": | ||
34 | if python_build: | ||
35 | @@ -315,7 +317,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): | ||
36 | If 'prefix' is supplied, use it instead of sys.base_prefix or | ||
37 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. | ||
38 | """ | ||
39 | - if prefix is None: | ||
40 | + if os.environ.get('STAGING_LIBDIR', ""): | ||
41 | + lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1] | ||
42 | + else: | ||
43 | + lib_basename = "lib" | ||
44 | + if prefix is None and os.environ.get('STAGING_LIBDIR', ""): | ||
45 | + prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) | ||
46 | + elif prefix is None: | ||
47 | if standard_lib: | ||
48 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX | ||
49 | else: | ||
50 | @@ -329,7 +337,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): | ||
51 | else: | ||
52 | # Pure Python | ||
53 | libdir = "lib" | ||
54 | - libpython = os.path.join(prefix, libdir, | ||
55 | + libpython = os.path.join(prefix, lib_basename, | ||
56 | "python" + get_python_version()) | ||
57 | if standard_lib: | ||
58 | return libpython | ||