summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch22
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.2.bb2
2 files changed, 10 insertions, 14 deletions
diff --git a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
index 8e721fe002..b46caf64fe 100644
--- a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
@@ -2,12 +2,11 @@ Upstream-Status: Inappropriate [embedded specific]
2 2
3# The proper prefix is inside our staging area. 3# The proper prefix is inside our staging area.
4# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> 4# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
5# Signed-off-by: Phil Blundell <philb@gnu.org>
5 6
6Index: Python-2.6.6/Lib/distutils/sysconfig.py 7--- Python-2.6.6/Lib/distutils/sysconfig.py.orig 2012-01-03 14:02:03.027005296 +0000
7=================================================================== 8+++ Python-2.6.6/Lib/distutils/sysconfig.py 2012-01-03 14:02:31.517601081 +0000
8--- Python-2.6.6.orig/Lib/distutils/sysconfig.py 9@@ -19,8 +19,8 @@
9+++ Python-2.6.6/Lib/distutils/sysconfig.py
10@@ -19,8 +19,8 @@ import sys
11 from distutils.errors import DistutilsPlatformError 10 from distutils.errors import DistutilsPlatformError
12 11
13 # These are needed in a couple of spots, so just compute them once. 12 # These are needed in a couple of spots, so just compute them once.
@@ -18,19 +17,16 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py
18 17
19 # Path to the base directory of the project. On Windows the binary may 18 # Path to the base directory of the project. On Windows the binary may
20 # live in project/PCBuild9. If we're dealing with an x64 Windows build, 19 # live in project/PCBuild9. If we're dealing with an x64 Windows build,
21@@ -70,7 +70,10 @@ def get_python_inc(plat_specific=0, pref 20@@ -70,7 +70,7 @@
22 sys.exec_prefix -- i.e., ignore 'plat_specific'. 21 sys.exec_prefix -- i.e., ignore 'plat_specific'.
23 """ 22 """
24 if prefix is None: 23 if prefix is None:
25- prefix = plat_specific and EXEC_PREFIX or PREFIX 24- prefix = plat_specific and EXEC_PREFIX or PREFIX
26+ if plat_specific: 25+ prefix = os.environ['STAGING_INCDIR'].rstrip('include')
27+ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include')
28+ else:
29+ prefix = plat_specific and EXEC_PREFIX or PREFIX
30 26
31 if os.name == "posix": 27 if os.name == "posix":
32 if python_build: 28 if python_build:
33@@ -115,12 +118,16 @@ def get_python_lib(plat_specific=0, stan 29@@ -115,12 +115,16 @@
34 If 'prefix' is supplied, use it instead of sys.prefix or 30 If 'prefix' is supplied, use it instead of sys.prefix or
35 sys.exec_prefix -- i.e., ignore 'plat_specific'. 31 sys.exec_prefix -- i.e., ignore 'plat_specific'.
36 """ 32 """
@@ -49,7 +45,7 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py
49 if standard_lib: 45 if standard_lib:
50 return libpython 46 return libpython
51 else: 47 else:
52@@ -216,7 +223,7 @@ def get_config_h_filename(): 48@@ -216,7 +220,7 @@
53 else: 49 else:
54 # The name of the config.h file changed in 2.2 50 # The name of the config.h file changed in 2.2
55 config_h = 'pyconfig.h' 51 config_h = 'pyconfig.h'
@@ -58,7 +54,7 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py
58 54
59 55
60 def get_makefile_filename(): 56 def get_makefile_filename():
61@@ -225,7 +232,7 @@ def get_makefile_filename(): 57@@ -225,7 +229,7 @@
62 return os.path.join(os.path.dirname(os.path.realpath(sys.executable)), 58 return os.path.join(os.path.dirname(os.path.realpath(sys.executable)),
63 "Makefile") 59 "Makefile")
64 lib_dir = get_python_lib(plat_specific=1, standard_lib=1) 60 lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
diff --git a/meta/recipes-devtools/python/python-native_2.7.2.bb b/meta/recipes-devtools/python/python-native_2.7.2.bb
index 7d8c597447..8bf736d1ec 100644
--- a/meta/recipes-devtools/python/python-native_2.7.2.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.2.bb
@@ -1,6 +1,6 @@
1require python.inc 1require python.inc
2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" 2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
3PR = "${INC_PR}.2" 3PR = "${INC_PR}.3"
4 4
5SRC_URI += "file://04-default-is-optimized.patch \ 5SRC_URI += "file://04-default-is-optimized.patch \
6 file://05-enable-ctypes-cross-build.patch \ 6 file://05-enable-ctypes-cross-build.patch \