diff options
3 files changed, 30 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index 682bd5a2da..62a6ba1589 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc | |||
@@ -4,7 +4,7 @@ LICENSE = "PSF" | |||
4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
5 | PRIORITY = "optional" | 5 | PRIORITY = "optional" |
6 | # bump this on every change in contrib/python/generate-manifest-2.6.py | 6 | # bump this on every change in contrib/python/generate-manifest-2.6.py |
7 | INC_PR = "ml8" | 7 | INC_PR = "nk0" |
8 | 8 | ||
9 | DEFAULT_PREFERENCE = "-26" | 9 | DEFAULT_PREFERENCE = "-26" |
10 | 10 | ||
diff --git a/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch b/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch new file mode 100644 index 0000000000..30aa50dd44 --- /dev/null +++ b/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | The poison directories patch has detected library path issue while | ||
2 | compiling the python in cross environment, as seen bellow. | ||
3 | |||
4 | warning: library search path "/usr/lib/termcap" is unsafe for cross-compilation | ||
5 | |||
6 | This Patch fixes this issue in the python build environment. | ||
7 | 11 Oct 2010 | ||
8 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
9 | |||
10 | Index: Python-2.6.5/setup.py | ||
11 | =================================================================== | ||
12 | --- Python-2.6.5.orig/setup.py | ||
13 | +++ Python-2.6.5/setup.py | ||
14 | @@ -591,12 +591,10 @@ class PyBuildExt(build_ext): | ||
15 | readline_libs.append('ncurses') | ||
16 | elif self.compiler.find_library_file(lib_dirs, 'curses'): | ||
17 | readline_libs.append('curses') | ||
18 | - elif self.compiler.find_library_file(lib_dirs + | ||
19 | - ['/usr/lib/termcap'], | ||
20 | + elif self.compiler.find_library_file(lib_dirs, | ||
21 | 'termcap'): | ||
22 | readline_libs.append('termcap') | ||
23 | exts.append( Extension('readline', ['readline.c'], | ||
24 | - library_dirs=['/usr/lib/termcap'], | ||
25 | extra_link_args=readline_extra_link_args, | ||
26 | libraries=readline_libs) ) | ||
27 | else: | ||
diff --git a/meta/recipes-devtools/python/python_2.6.5.bb b/meta/recipes-devtools/python/python_2.6.5.bb index 9658fd48dc..674b673f94 100644 --- a/meta/recipes-devtools/python/python_2.6.5.bb +++ b/meta/recipes-devtools/python/python_2.6.5.bb | |||
@@ -2,7 +2,7 @@ require python.inc | |||
2 | DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" | 2 | DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" |
3 | DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" | 3 | DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" |
4 | # set to .0 on every increase of INC_PR | 4 | # set to .0 on every increase of INC_PR |
5 | PR = "${INC_PR}.2" | 5 | PR = "${INC_PR}.3" |
6 | 6 | ||
7 | SRC_URI = "\ | 7 | SRC_URI = "\ |
8 | http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ | 8 | http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ |
@@ -12,6 +12,7 @@ SRC_URI = "\ | |||
12 | file://03-fix-tkinter-detection.patch \ | 12 | file://03-fix-tkinter-detection.patch \ |
13 | file://04-default-is-optimized.patch \ | 13 | file://04-default-is-optimized.patch \ |
14 | file://05-enable-ctypes-cross-build.patch \ | 14 | file://05-enable-ctypes-cross-build.patch \ |
15 | file://06-avoid_usr_lib_termcap_path_in_linking.patch \ | ||
15 | file://99-ignore-optimization-flag.patch \ | 16 | file://99-ignore-optimization-flag.patch \ |
16 | file://sitecustomize.py \ | 17 | file://sitecustomize.py \ |
17 | " | 18 | " |