summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-04-06 17:58:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-01 12:38:41 +0100
commit4977a0743ba439a46716c6ef10c5958d5a561115 (patch)
tree3372a088a3e8503fbf50df08bb227a6c2ad07025 /meta/recipes-devtools/python/python
parent49557a5e9d93665e2409e4b12850dc325dee19dd (diff)
downloadpoky-4977a0743ba439a46716c6ef10c5958d5a561115.tar.gz
python-native, python3-native: remove the use of exported HOST_SYS and BUILD_SYS variables
The code that utilized them was superseded by the code (in the same patch!) that is utilizing STAGING_LIBDIR/STAGING_INCDIR, and wasn't correct in the first place as HOST_SYS is not necessarily the same as the sysroot directory name. (From OE-Core rev: 8834e81a38c24a066bb4fefa93da61011d0db244) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python')
-rw-r--r--meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch b/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch
new file mode 100644
index 0000000000..502f849804
--- /dev/null
+++ b/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch
@@ -0,0 +1,51 @@
1From 4cdf2e9df13c6327fcc94d53e4953005543aef3d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 6 Apr 2016 17:43:02 +0300
4Subject: [PATCH 01/10] distutils: set the prefix to be inside staging
5 directory
6
7The proper prefix is inside our staging area.
8
9Upstream-Status: Inappropriate [embedded specific]
10Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille-media.de>
11Signed-off-by: Phil Blundell <philb@gnu.org>
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 Lib/distutils/sysconfig.py | 10 +++++++---
15 1 file changed, 7 insertions(+), 3 deletions(-)
16
17diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
18index de7da1d..f3aacf7 100644
19--- a/Lib/distutils/sysconfig.py
20+++ b/Lib/distutils/sysconfig.py
21@@ -75,7 +75,7 @@ def get_python_inc(plat_specific=0, prefix=None):
22 sys.exec_prefix -- i.e., ignore 'plat_specific'.
23 """
24 if prefix is None:
25- prefix = plat_specific and EXEC_PREFIX or PREFIX
26+ prefix = os.environ['STAGING_INCDIR'].rstrip('include')
27
28 if os.name == "posix":
29 if python_build:
30@@ -115,12 +115,16 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
31 If 'prefix' is supplied, use it instead of sys.prefix or
32 sys.exec_prefix -- i.e., ignore 'plat_specific'.
33 """
34+ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
35 if prefix is None:
36- prefix = plat_specific and EXEC_PREFIX or PREFIX
37+ if plat_specific:
38+ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
39+ else:
40+ prefix = PREFIX
41
42 if os.name == "posix":
43 libpython = os.path.join(prefix,
44- "lib", "python" + get_python_version())
45+ lib_basename, "python" + get_python_version())
46 if standard_lib:
47 return libpython
48 else:
49--
502.8.0.rc3
51