diff options
Diffstat (limited to 'meta/recipes-devtools/python/python')
3 files changed, 21 insertions, 31 deletions
diff --git a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch index a97ff6b250..506debaf76 100644 --- a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch +++ b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | |||
@@ -13,10 +13,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
13 | configure.ac | 2 +- | 13 | configure.ac | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | Index: Python-2.7.11/configure.ac | 16 | Index: Python-2.7.13/configure.ac |
17 | =================================================================== | 17 | =================================================================== |
18 | --- Python-2.7.11.orig/configure.ac | 18 | --- Python-2.7.13.orig/configure.ac |
19 | +++ Python-2.7.11/configure.ac | 19 | +++ Python-2.7.13/configure.ac |
20 | @@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then | 20 | @@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then |
21 | AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) | 21 | AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) |
22 | fi | 22 | fi |
@@ -24,5 +24,5 @@ Index: Python-2.7.11/configure.ac | |||
24 | - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp | 24 | - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp |
25 | + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp | 25 | + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp |
26 | fi | 26 | fi |
27 | elif test "$cross_compiling" = maybe; then | 27 | # Used to comment out stuff for rebuilding generated files |
28 | AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) | 28 | GENERATED_COMMENT='#' |
diff --git a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch index 3347321fde..287095f615 100644 --- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch +++ b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch | |||
@@ -7,13 +7,16 @@ Upstream-Status: Inappropriate [distribution] | |||
7 | Also simply disable the tk module since its not in DEPENDS. | 7 | Also simply disable the tk module since its not in DEPENDS. |
8 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | 8 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
9 | 9 | ||
10 | Index: Python-2.7.2/setup.py | 10 | Index: Python-2.7.13/setup.py |
11 | =================================================================== | 11 | =================================================================== |
12 | --- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 | 12 | --- Python-2.7.13.orig/setup.py |
13 | +++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 | 13 | +++ Python-2.7.13/setup.py |
14 | @@ -1634,8 +1634,10 @@ | 14 | @@ -1783,10 +1783,12 @@ class PyBuildExt(build_ext): |
15 | self.extensions.extend(exts) | ||
16 | |||
15 | # Call the method for detecting whether _tkinter can be compiled | 17 | # Call the method for detecting whether _tkinter can be compiled |
16 | self.detect_tkinter(inc_dirs, lib_dirs) | 18 | - self.detect_tkinter(inc_dirs, lib_dirs) |
19 | + # self.detect_tkinter(inc_dirs, lib_dirs) | ||
17 | 20 | ||
18 | - if '_tkinter' not in [e.name for e in self.extensions]: | 21 | - if '_tkinter' not in [e.name for e in self.extensions]: |
19 | - missing.append('_tkinter') | 22 | - missing.append('_tkinter') |
@@ -22,18 +25,5 @@ Index: Python-2.7.2/setup.py | |||
22 | + #if '_tkinter' not in [e.name for e in self.extensions]: | 25 | + #if '_tkinter' not in [e.name for e in self.extensions]: |
23 | + # missing.append('_tkinter') | 26 | + # missing.append('_tkinter') |
24 | 27 | ||
25 | return missing | 28 | ## # Uncomment these lines if you want to play with xxmodule.c |
26 | 29 | ## ext = Extension('xx', ['xxmodule.c']) | |
27 | diff --git Python-3.5.1.orig/setup.py Python-3.5.1/setup.py | ||
28 | index b4633b9..d7588c0 100644 | ||
29 | --- Python-3.5.1.orig/setup.py | ||
30 | +++ Python-3.5.1/setup.py | ||
31 | @@ -1536,7 +1536,7 @@ class PyBuildExt(build_ext): | ||
32 | self.extensions.extend(exts) | ||
33 | |||
34 | # Call the method for detecting whether _tkinter can be compiled | ||
35 | - self.detect_tkinter(inc_dirs, lib_dirs) | ||
36 | + # self.detect_tkinter(inc_dirs, lib_dirs) | ||
37 | |||
38 | # tkinter module will not be avalaible as yocto | ||
39 | # doesn't have tk integrated (yet) | ||
diff --git a/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch b/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch index 337e0e3e29..8ba5823014 100644 --- a/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch +++ b/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch | |||
@@ -5,12 +5,12 @@ Upstream-Status: Inappropriate [distribution] | |||
5 | 5 | ||
6 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | 6 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
7 | 7 | ||
8 | Index: Python-2.7.2/setup.py | 8 | Index: Python-2.7.13/setup.py |
9 | =================================================================== | 9 | =================================================================== |
10 | --- Python-2.7.2.orig/setup.py 2012-04-05 22:29:18.049196608 +0300 | 10 | --- Python-2.7.13.orig/setup.py |
11 | +++ Python-2.7.2/setup.py 2012-04-05 22:29:57.505195453 +0300 | 11 | +++ Python-2.7.13/setup.py |
12 | @@ -1522,8 +1522,9 @@ | 12 | @@ -1671,8 +1671,9 @@ class PyBuildExt(build_ext): |
13 | if platform == 'sunos5': | 13 | if host_platform == 'sunos5': |
14 | # SunOS specific modules | 14 | # SunOS specific modules |
15 | exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) ) | 15 | exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) ) |
16 | - else: | 16 | - else: |
@@ -19,5 +19,5 @@ Index: Python-2.7.2/setup.py | |||
19 | + #else: | 19 | + #else: |
20 | + # missing.append('sunaudiodev') | 20 | + # missing.append('sunaudiodev') |
21 | 21 | ||
22 | if platform == 'darwin': | 22 | if host_platform == 'darwin': |
23 | # _scproxy | 23 | # _scproxy |