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 | 60 |
1 files changed, 0 insertions, 60 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 5a39cf8933..0000000000 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | From c52fa7948ef109db1132fdc1aee0b68f8d767b4e 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 1/2] 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 | Lib/distutils/sysconfig.py | 14 +++++++++++--- | ||
17 | 1 file changed, 11 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py | ||
20 | index 4774e12..ccf7d58 100644 | ||
21 | --- a/Lib/distutils/sysconfig.py | ||
22 | +++ b/Lib/distutils/sysconfig.py | ||
23 | @@ -95,7 +95,9 @@ def get_python_inc(plat_specific=0, prefix=None): | ||
24 | If 'prefix' is supplied, use it instead of sys.base_prefix or | ||
25 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. | ||
26 | """ | ||
27 | - if prefix is None: | ||
28 | + if prefix is None and os.environ.get('STAGING_INCDIR', ""): | ||
29 | + prefix = os.environ['STAGING_INCDIR'].rstrip('include') | ||
30 | + elif prefix is None: | ||
31 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX | ||
32 | if os.name == "posix": | ||
33 | if python_build: | ||
34 | @@ -138,7 +140,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): | ||
35 | If 'prefix' is supplied, use it instead of sys.base_prefix or | ||
36 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. | ||
37 | """ | ||
38 | - if prefix is None: | ||
39 | + if os.environ.get('STAGING_LIBDIR', ""): | ||
40 | + lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1] | ||
41 | + else: | ||
42 | + lib_basename = "lib" | ||
43 | + if prefix is None and os.environ.get('STAGING_LIBDIR', ""): | ||
44 | + prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) | ||
45 | + elif prefix is None: | ||
46 | if standard_lib: | ||
47 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX | ||
48 | else: | ||
49 | @@ -152,7 +160,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): | ||
50 | else: | ||
51 | # Pure Python | ||
52 | libdir = "lib" | ||
53 | - libpython = os.path.join(prefix, libdir, | ||
54 | + libpython = os.path.join(prefix, lib_basename, | ||
55 | "python" + get_python_version()) | ||
56 | if standard_lib: | ||
57 | return libpython | ||
58 | -- | ||
59 | 2.24.0 | ||
60 | |||