summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTyler Hall <tylerwhall@gmail.com>2014-05-04 20:06:43 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-08 13:00:32 +0100
commit28798f196360f76e0edba4d8057f863ec0318fd3 (patch)
tree4d6f40ca33ba2c080c0767dadbe8d49572ca85b5 /meta
parentbb07e85810d93ca6019ef317bcf3bf794c968a6b (diff)
downloadpoky-28798f196360f76e0edba4d8057f863ec0318fd3.tar.gz
python3: Revert python-config to distutils.sysconfig
The newer sysconfig module shares some code with distutils.sysconfig, but the same modifications as in 12-distutils-prefix-is-inside-staging-area.patch makes distutils.sysconfig affect the native runtime as well as cross building. Use the old, patched implementation which returns paths in the staging directory and for the target, as appropriate. This change reverts this upstream patch http://hg.python.org/cpython/diff/712970b019f7/Misc/python-config.in (From OE-Core rev: 7b2ffd68ae8235dcc3ddff9cbe8525e61f3b3d28) Signed-off-by: Tyler Hall <tylerwhall@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python3-native_3.3.3.bb1
-rw-r--r--meta/recipes-devtools/python/python3/python-config.patch46
-rw-r--r--meta/recipes-devtools/python/python3_3.3.3.bb1
3 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3-native_3.3.3.bb b/meta/recipes-devtools/python/python3-native_3.3.3.bb
index 0fd73498e8..9ae2a0b373 100644
--- a/meta/recipes-devtools/python/python3-native_3.3.3.bb
+++ b/meta/recipes-devtools/python/python3-native_3.3.3.bb
@@ -6,6 +6,7 @@ DISTRO_SRC_URI ?= "file://sitecustomize.py"
6DISTRO_SRC_URI_linuxstdbase = "" 6DISTRO_SRC_URI_linuxstdbase = ""
7SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ 7SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
8file://12-distutils-prefix-is-inside-staging-area.patch \ 8file://12-distutils-prefix-is-inside-staging-area.patch \
9file://python-config.patch \
9file://000-cross-compile.patch \ 10file://000-cross-compile.patch \
10file://020-dont-compile-python-files.patch \ 11file://020-dont-compile-python-files.patch \
11file://030-fixup-include-dirs.patch \ 12file://030-fixup-include-dirs.patch \
diff --git a/meta/recipes-devtools/python/python3/python-config.patch b/meta/recipes-devtools/python/python3/python-config.patch
new file mode 100644
index 0000000000..f23b8b7df0
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/python-config.patch
@@ -0,0 +1,46 @@
1python-config: Revert to using distutils.sysconfig
2
3The newer sysconfig module shares some code with distutils.sysconfig, but the same modifications as in
4
512-distutils-prefix-is-inside-staging-area.patch makes distutils.sysconfig
6
7affect the native runtime as well as cross building. Use the old, patched
8implementation which returns paths in the staging directory and for the target,
9as appropriate.
10
11Upstream-Status: Inappropriate [Embedded Specific]
12
13Signed-off-by: Tyler Hall <tylerwhall@gmail.com>
14:
15Index: Python-3.3.3/Misc/python-config.in
16===================================================================
17--- Python-3.3.3.orig/Misc/python-config.in
18+++ Python-3.3.3/Misc/python-config.in
19@@ -4,7 +4,7 @@
20 import getopt
21 import os
22 import sys
23-import sysconfig
24+from distutils import sysconfig
25
26 valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
27 'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir']
28@@ -32,14 +32,14 @@ if '--help' in opt_flags:
29
30 for opt in opt_flags:
31 if opt == '--prefix':
32- print(sysconfig.get_config_var('prefix'))
33+ print(sysconfig.PREFIX)
34
35 elif opt == '--exec-prefix':
36- print(sysconfig.get_config_var('exec_prefix'))
37+ print(sysconfig.EXEC_PREFIX)
38
39 elif opt in ('--includes', '--cflags'):
40- flags = ['-I' + sysconfig.get_path('include'),
41- '-I' + sysconfig.get_path('platinclude')]
42+ flags = ['-I' + sysconfig.get_python_inc(),
43+ '-I' + sysconfig.get_python_inc(plat_specific=True)]
44 if opt == '--cflags':
45 flags.extend(getvar('CFLAGS').split())
46 print(' '.join(flags))
diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb b/meta/recipes-devtools/python/python3_3.3.3.bb
index c357bbb07e..a1cb12078f 100644
--- a/meta/recipes-devtools/python/python3_3.3.3.bb
+++ b/meta/recipes-devtools/python/python3_3.3.3.bb
@@ -8,6 +8,7 @@ DISTRO_SRC_URI ?= "file://sitecustomize.py"
8DISTRO_SRC_URI_linuxstdbase = "" 8DISTRO_SRC_URI_linuxstdbase = ""
9SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ 9SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
10file://12-distutils-prefix-is-inside-staging-area.patch \ 10file://12-distutils-prefix-is-inside-staging-area.patch \
11file://python-config.patch \
11file://000-cross-compile.patch \ 12file://000-cross-compile.patch \
12file://020-dont-compile-python-files.patch \ 13file://020-dont-compile-python-files.patch \
13file://030-fixup-include-dirs.patch \ 14file://030-fixup-include-dirs.patch \