summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross.inc2
-rw-r--r--meta/recipes-devtools/python/python-dbus_1.2.0.bb3
-rw-r--r--meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch65
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.11.bb4
-rw-r--r--meta/recipes-devtools/python/python-numpy_1.10.4.bb1
-rw-r--r--meta/recipes-devtools/python/python-pycairo_1.10.0.bb2
-rw-r--r--meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch51
-rw-r--r--meta/recipes-devtools/python/python3-native_3.5.1.bb2
-rw-r--r--meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch49
-rw-r--r--meta/recipes-devtools/python/python3_3.5.1.bb4
-rw-r--r--meta/recipes-devtools/python/python_2.7.11.bb3
11 files changed, 62 insertions, 124 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc
index 2468d23037..c62715f883 100644
--- a/meta/recipes-devtools/gdb/gdb-cross.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross.inc
@@ -10,8 +10,6 @@ PACKAGECONFIG[python] = "--with-python=${STAGING_BINDIR_NATIVE}/python-native/py
10PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" 10PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
11 11
12do_compile_prepend() { 12do_compile_prepend() {
13 export BUILD_SYS="${BUILD_SYS}"
14 export HOST_SYS="${HOST_SYS}"
15 export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}" 13 export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}"
16 export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" 14 export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}"
17} 15}
diff --git a/meta/recipes-devtools/python/python-dbus_1.2.0.bb b/meta/recipes-devtools/python/python-dbus_1.2.0.bb
index b314dce1c7..ccdb9ae7e9 100644
--- a/meta/recipes-devtools/python/python-dbus_1.2.0.bb
+++ b/meta/recipes-devtools/python/python-dbus_1.2.0.bb
@@ -18,9 +18,6 @@ PACKAGECONFIG ?= ""
18PACKAGECONFIG[docs] = "--enable-html-docs,--disable-html-docs,python-docutils-native" 18PACKAGECONFIG[docs] = "--enable-html-docs,--disable-html-docs,python-docutils-native"
19PACKAGECONFIG[api-docs] = "--enable-api-docs,--disable-api-docs,python-docutils-native python-epydoc-native" 19PACKAGECONFIG[api-docs] = "--enable-api-docs,--disable-api-docs,python-docutils-native python-epydoc-native"
20 20
21export BUILD_SYS
22export HOST_SYS
23
24export STAGING_LIBDIR 21export STAGING_LIBDIR
25export STAGING_INCDIR 22export STAGING_INCDIR
26 23
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
deleted file mode 100644
index f89aaff7b1..0000000000
--- a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3# The proper prefix is inside our staging area.
4# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
5# Signed-off-by: Phil Blundell <philb@gnu.org>
6
7--- Python-2.6.6/Lib/distutils/sysconfig.py.orig 2012-01-03 14:02:03.027005296 +0000
8+++ Python-2.6.6/Lib/distutils/sysconfig.py 2012-01-03 14:02:31.517601081 +0000
9@@ -19,8 +19,8 @@
10 from distutils.errors import DistutilsPlatformError
11
12 # These are needed in a couple of spots, so just compute them once.
13-PREFIX = os.path.normpath(sys.prefix)
14-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
15+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
16+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
17
18 # Path to the base directory of the project. On Windows the binary may
19 # live in project/PCBuild9. If we're dealing with an x64 Windows build,
20@@ -70,7 +70,7 @@
21 sys.exec_prefix -- i.e., ignore 'plat_specific'.
22 """
23 if prefix is None:
24- prefix = plat_specific and EXEC_PREFIX or PREFIX
25+ prefix = os.environ['STAGING_INCDIR'].rstrip('include')
26
27 if os.name == "posix":
28 if python_build:
29@@ -115,12 +115,16 @@
30 If 'prefix' is supplied, use it instead of sys.prefix or
31 sys.exec_prefix -- i.e., ignore 'plat_specific'.
32 """
33+ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
34 if prefix is None:
35- prefix = plat_specific and EXEC_PREFIX or PREFIX
36+ if plat_specific:
37+ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
38+ else:
39+ prefix = PREFIX
40
41 if os.name == "posix":
42 libpython = os.path.join(prefix,
43- "lib", "python" + get_python_version())
44+ lib_basename, "python" + get_python_version())
45 if standard_lib:
46 return libpython
47 else:
48@@ -216,7 +220,7 @@
49 else:
50 # The name of the config.h file changed in 2.2
51 config_h = 'pyconfig.h'
52- return os.path.join(inc_dir, config_h)
53+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
54
55
56 def get_makefile_filename():
57@@ -225,7 +229,7 @@
58 return os.path.join(os.path.dirname(os.path.realpath(sys.executable)),
59 "Makefile")
60 lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
61- return os.path.join(lib_dir, "config", "Makefile")
62+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
63
64
65 def parse_config_h(fp, g=None):
diff --git a/meta/recipes-devtools/python/python-native_2.7.11.bb b/meta/recipes-devtools/python/python-native_2.7.11.bb
index abb69fcd20..31192cafc9 100644
--- a/meta/recipes-devtools/python/python-native_2.7.11.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.11.bb
@@ -8,7 +8,7 @@ SRC_URI += "\
8 file://05-enable-ctypes-cross-build.patch \ 8 file://05-enable-ctypes-cross-build.patch \
9 file://10-distutils-fix-swig-parameter.patch \ 9 file://10-distutils-fix-swig-parameter.patch \
10 file://11-distutils-never-modify-shebang-line.patch \ 10 file://11-distutils-never-modify-shebang-line.patch \
11 file://12-distutils-prefix-is-inside-staging-area.patch \ 11 file://0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch \
12 file://debug.patch \ 12 file://debug.patch \
13 file://unixccompiler.patch \ 13 file://unixccompiler.patch \
14 file://nohostlibs.patch \ 14 file://nohostlibs.patch \
@@ -30,8 +30,6 @@ RPROVIDES += "python-distutils-native python-compression-native python-textutils
30EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --with-system-expat=${STAGING_DIR_HOST}" 30EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --with-system-expat=${STAGING_DIR_HOST}"
31 31
32EXTRA_OEMAKE = '\ 32EXTRA_OEMAKE = '\
33 BUILD_SYS="" \
34 HOST_SYS="" \
35 LIBC="" \ 33 LIBC="" \
36 STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ 34 STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
37 STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ 35 STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \
diff --git a/meta/recipes-devtools/python/python-numpy_1.10.4.bb b/meta/recipes-devtools/python/python-numpy_1.10.4.bb
index 8a562dcb99..ca6a7abb0e 100644
--- a/meta/recipes-devtools/python/python-numpy_1.10.4.bb
+++ b/meta/recipes-devtools/python/python-numpy_1.10.4.bb
@@ -63,7 +63,6 @@ inherit distutils
63# Make the build fail and replace *config.h with proper one 63# Make the build fail and replace *config.h with proper one
64# This is a ugly, ugly hack - Koen 64# This is a ugly, ugly hack - Koen
65do_compile_prepend_class-target() { 65do_compile_prepend_class-target() {
66 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
67 ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ 66 ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \
68 true 67 true
69 cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ 68 cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/
diff --git a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
index 70fe25c1a1..78e8a4e226 100644
--- a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
+++ b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
@@ -23,7 +23,7 @@ inherit distutils pkgconfig
23BBCLASSEXTEND = "native" 23BBCLASSEXTEND = "native"
24 24
25do_configure() { 25do_configure() {
26 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir} 26 ./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir}
27} 27}
28 28
29do_compile() { 29do_compile() {
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
diff --git a/meta/recipes-devtools/python/python3-native_3.5.1.bb b/meta/recipes-devtools/python/python3-native_3.5.1.bb
index 7bad11aafa..e8d0f9b5ea 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.1.bb
@@ -47,8 +47,6 @@ RPROVIDES += "python3-distutils-native python3-compression-native python3-textut
47EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --without-ensurepip" 47EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --without-ensurepip"
48 48
49EXTRA_OEMAKE = '\ 49EXTRA_OEMAKE = '\
50 BUILD_SYS="" \
51 HOST_SYS="" \
52 LIBC="" \ 50 LIBC="" \
53 STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ 51 STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
54 STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ 52 STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \
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
index 8b93c1cf4f..c53ec0cfc8 100644
--- 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
@@ -1,4 +1,4 @@
1From d4dd67daa1555bf13272cc071706338572539bad Mon Sep 17 00:00:00 2001 1From 7630ab22578746d3d790d0598c0d279cf7afed97 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 14 May 2013 15:00:26 -0700 3Date: Tue, 14 May 2013 15:00:26 -0700
4Subject: [PATCH 01/20] python3: Add target and native recipes 4Subject: [PATCH 01/20] python3: Add target and native recipes
@@ -14,27 +14,14 @@ Upstream-Status: Inappropriate [embedded specific]
14# Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> 14# Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
15 15
16--- 16---
17 Lib/distutils/sysconfig.py | 10 ++++++++--
18 1 file changed, 8 insertions(+), 2 deletions(-)
19
17diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py 20diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
18index 573724d..418b478 100644 21index 573724d..390c485 100644
19--- a/Lib/distutils/sysconfig.py 22--- a/Lib/distutils/sysconfig.py
20+++ b/Lib/distutils/sysconfig.py 23+++ b/Lib/distutils/sysconfig.py
21@@ -17,10 +17,11 @@ import sys 24@@ -84,7 +84,9 @@ def get_python_inc(plat_specific=0, prefix=None):
22 from .errors import DistutilsPlatformError
23
24 # These are needed in a couple of spots, so just compute them once.
25-PREFIX = os.path.normpath(sys.prefix)
26-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
27-BASE_PREFIX = os.path.normpath(sys.base_prefix)
28-BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
29+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
30+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
31+BASE_PREFIX = os.path.normpath(sys.base_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
32+BASE_EXEC_PREFIX= os.path.normpath(sys.base_exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
33+
34
35 # Path to the base directory of the project. On Windows the binary may
36 # live in project/PCBuild/win32 or project/PCBuild/amd64.
37@@ -84,7 +85,9 @@ def get_python_inc(plat_specific=0, prefix=None):
38 If 'prefix' is supplied, use it instead of sys.base_prefix or 25 If 'prefix' is supplied, use it instead of sys.base_prefix or
39 sys.base_exec_prefix -- i.e., ignore 'plat_specific'. 26 sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
40 """ 27 """
@@ -45,7 +32,7 @@ index 573724d..418b478 100644
45 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX 32 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
46 if os.name == "posix": 33 if os.name == "posix":
47 if python_build: 34 if python_build:
48@@ -125,6 +128,10 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): 35@@ -125,6 +127,10 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
49 If 'prefix' is supplied, use it instead of sys.base_prefix or 36 If 'prefix' is supplied, use it instead of sys.base_prefix or
50 sys.base_exec_prefix -- i.e., ignore 'plat_specific'. 37 sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
51 """ 38 """
@@ -56,7 +43,7 @@ index 573724d..418b478 100644
56 if prefix is None: 43 if prefix is None:
57 if standard_lib: 44 if standard_lib:
58 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX 45 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
59@@ -133,7 +140,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): 46@@ -133,7 +139,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
60 47
61 if os.name == "posix": 48 if os.name == "posix":
62 libpython = os.path.join(prefix, 49 libpython = os.path.join(prefix,
@@ -65,24 +52,6 @@ index 573724d..418b478 100644
65 if standard_lib: 52 if standard_lib:
66 return libpython 53 return libpython
67 else: 54 else:
68@@ -233,7 +240,7 @@ def get_config_h_filename():
69 else:
70 inc_dir = get_python_inc(plat_specific=1)
71
72- return os.path.join(inc_dir, 'pyconfig.h')
73+ return os.path.join(inc_dir, 'pyconfig.h'.replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ))
74
75
76 def get_makefile_filename():
77@@ -242,7 +249,7 @@ def get_makefile_filename():
78 return os.path.join(_sys_home or project_base, "Makefile")
79 lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
80 config_file = 'config-{}{}'.format(get_python_version(), build_flags)
81- return os.path.join(lib_dir, config_file, 'Makefile')
82+ return os.path.join(lib_dir, config_file, 'Makefile').replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
83
84
85 def parse_config_h(fp, g=None):
86-- 55--
872.7.0 562.8.0.rc3
88 57
diff --git a/meta/recipes-devtools/python/python3_3.5.1.bb b/meta/recipes-devtools/python/python3_3.5.1.bb
index 2fbb3cbc30..26d05c76b0 100644
--- a/meta/recipes-devtools/python/python3_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3_3.5.1.bb
@@ -118,7 +118,6 @@ do_compile() {
118 STAGING_LIBDIR=${STAGING_LIBDIR} \ 118 STAGING_LIBDIR=${STAGING_LIBDIR} \
119 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ 119 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
120 STAGING_INCDIR=${STAGING_INCDIR} \ 120 STAGING_INCDIR=${STAGING_INCDIR} \
121 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
122 LIB=${baselib} \ 121 LIB=${baselib} \
123 ARCH=${TARGET_ARCH} \ 122 ARCH=${TARGET_ARCH} \
124 OPT="${CFLAGS}" libpython3.so 123 OPT="${CFLAGS}" libpython3.so
@@ -128,7 +127,6 @@ do_compile() {
128 STAGING_LIBDIR=${STAGING_LIBDIR} \ 127 STAGING_LIBDIR=${STAGING_LIBDIR} \
129 STAGING_INCDIR=${STAGING_INCDIR} \ 128 STAGING_INCDIR=${STAGING_INCDIR} \
130 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ 129 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
131 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
132 LIB=${baselib} \ 130 LIB=${baselib} \
133 ARCH=${TARGET_ARCH} \ 131 ARCH=${TARGET_ARCH} \
134 OPT="${CFLAGS}" 132 OPT="${CFLAGS}"
@@ -149,7 +147,6 @@ do_install() {
149 STAGING_LIBDIR=${STAGING_LIBDIR} \ 147 STAGING_LIBDIR=${STAGING_LIBDIR} \
150 STAGING_INCDIR=${STAGING_INCDIR} \ 148 STAGING_INCDIR=${STAGING_INCDIR} \
151 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ 149 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
152 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
153 LIB=${baselib} \ 150 LIB=${baselib} \
154 ARCH=${TARGET_ARCH} \ 151 ARCH=${TARGET_ARCH} \
155 DESTDIR=${D} LIBDIR=${libdir} 152 DESTDIR=${D} LIBDIR=${libdir}
@@ -159,7 +156,6 @@ do_install() {
159 STAGING_LIBDIR=${STAGING_LIBDIR} \ 156 STAGING_LIBDIR=${STAGING_LIBDIR} \
160 STAGING_INCDIR=${STAGING_INCDIR} \ 157 STAGING_INCDIR=${STAGING_INCDIR} \
161 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ 158 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
162 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
163 LIB=${baselib} \ 159 LIB=${baselib} \
164 ARCH=${TARGET_ARCH} \ 160 ARCH=${TARGET_ARCH} \
165 DESTDIR=${D} LIBDIR=${libdir} install 161 DESTDIR=${D} LIBDIR=${libdir} install
diff --git a/meta/recipes-devtools/python/python_2.7.11.bb b/meta/recipes-devtools/python/python_2.7.11.bb
index 606f153623..7eced2dcdc 100644
--- a/meta/recipes-devtools/python/python_2.7.11.bb
+++ b/meta/recipes-devtools/python/python_2.7.11.bb
@@ -80,7 +80,6 @@ do_compile() {
80 STAGING_LIBDIR=${STAGING_LIBDIR} \ 80 STAGING_LIBDIR=${STAGING_LIBDIR} \
81 STAGING_INCDIR=${STAGING_INCDIR} \ 81 STAGING_INCDIR=${STAGING_INCDIR} \
82 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ 82 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
83 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
84 OPT="${CFLAGS}" 83 OPT="${CFLAGS}"
85} 84}
86 85
@@ -100,7 +99,6 @@ do_install() {
100 STAGING_LIBDIR=${STAGING_LIBDIR} \ 99 STAGING_LIBDIR=${STAGING_LIBDIR} \
101 STAGING_INCDIR=${STAGING_INCDIR} \ 100 STAGING_INCDIR=${STAGING_INCDIR} \
102 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ 101 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
103 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
104 DESTDIR=${D} LIBDIR=${libdir} 102 DESTDIR=${D} LIBDIR=${libdir}
105 103
106 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ 104 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
@@ -109,7 +107,6 @@ do_install() {
109 STAGING_LIBDIR=${STAGING_LIBDIR} \ 107 STAGING_LIBDIR=${STAGING_LIBDIR} \
110 STAGING_INCDIR=${STAGING_INCDIR} \ 108 STAGING_INCDIR=${STAGING_INCDIR} \
111 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ 109 STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
112 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
113 DESTDIR=${D} LIBDIR=${libdir} install 110 DESTDIR=${D} LIBDIR=${libdir} install
114 111
115 install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile 112 install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile