summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-11-08 10:34:46 -0800
committerSaul Wold <sgw@linux.intel.com>2010-11-14 21:08:26 -0800
commit793bb465b3a6b0c883340621575b9944d7ccaf5a (patch)
treeb668cfadf3836b3d018dd76005f3bb65b4f8dd03 /meta/recipes-devtools/python
parenta7af5c516e547e669d92569dba21a9c1c790cf7f (diff)
downloadpoky-793bb465b3a6b0c883340621575b9944d7ccaf5a.tar.gz
python, python-native upgrade from 2.6.5 to 2.6.6
Removed these patch: python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch python/00-fix-bindir-libdir-for-cross.patch The upstream code has changed, and it does not need the above 2 patches (fixes) anymore. Patches rebased to the newer code: python/01-use-proper-tools-for-cross-build.patch python/04-default-is-optimized.patch python/06-avoid_usr_lib_termcap_path_in_linking.patch python/99-ignore-optimization-flag.patch Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch20
-rw-r--r--meta/recipes-devtools/python/python-native/04-default-is-optimized.patch (renamed from meta/recipes-devtools/python/python-native-2.6.5/04-default-is-optimized.patch)0
-rw-r--r--meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch (renamed from meta/recipes-devtools/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch)0
-rw-r--r--meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch (renamed from meta/recipes-devtools/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch)0
-rw-r--r--meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch (renamed from meta/recipes-devtools/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch)18
-rw-r--r--meta/recipes-devtools/python/python-native/debug.patch (renamed from meta/recipes-devtools/python/python-native-2.6.5/debug.patch)0
-rw-r--r--meta/recipes-devtools/python/python-native/nohostlibs.patch (renamed from meta/recipes-devtools/python/python-native-2.6.5/nohostlibs.patch)20
-rw-r--r--meta/recipes-devtools/python/python-native/sitecustomize.py (renamed from meta/recipes-devtools/python/python-native-2.6.5/sitecustomize.py)0
-rw-r--r--meta/recipes-devtools/python/python-native_2.6.6.bb (renamed from meta/recipes-devtools/python/python-native_2.6.5.bb)4
-rw-r--r--meta/recipes-devtools/python/python/00-fix-bindir-libdir-for-cross.patch20
-rw-r--r--meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch32
-rw-r--r--meta/recipes-devtools/python/python/04-default-is-optimized.patch28
-rw-r--r--meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch14
-rw-r--r--meta/recipes-devtools/python/python/99-ignore-optimization-flag.patch20
-rw-r--r--meta/recipes-devtools/python/python_2.6.6.bb (renamed from meta/recipes-devtools/python/python_2.6.5.bb)4
15 files changed, 69 insertions, 111 deletions
diff --git a/meta/recipes-devtools/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch b/meta/recipes-devtools/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch
deleted file mode 100644
index 2559e3a0e4..0000000000
--- a/meta/recipes-devtools/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1# $(exec_prefix) points to the wrong directory, when installing
2# a cross-build. @bindir@ and @libdir@ works better and doesn't
3# affect the native build.
4# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
5
6Index: Python-2.6.1/Makefile.pre.in
7===================================================================
8--- Python-2.6.1.orig/Makefile.pre.in
9+++ Python-2.6.1/Makefile.pre.in
10@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@
11 datarootdir= @datarootdir@
12
13 # Expanded directories
14-BINDIR= $(exec_prefix)/bin
15-LIBDIR= $(exec_prefix)/lib
16+BINDIR= @bindir@
17+LIBDIR= @libdir@
18 MANDIR= @mandir@
19 INCLUDEDIR= @includedir@
20 CONFINCLUDEDIR= $(exec_prefix)/include
diff --git a/meta/recipes-devtools/python/python-native-2.6.5/04-default-is-optimized.patch b/meta/recipes-devtools/python/python-native/04-default-is-optimized.patch
index 5131e0ba69..5131e0ba69 100644
--- a/meta/recipes-devtools/python/python-native-2.6.5/04-default-is-optimized.patch
+++ b/meta/recipes-devtools/python/python-native/04-default-is-optimized.patch
diff --git a/meta/recipes-devtools/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch b/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch
index f5e852a118..f5e852a118 100644
--- a/meta/recipes-devtools/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch
+++ b/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch
diff --git a/meta/recipes-devtools/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch b/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch
index 8354e266fa..8354e266fa 100644
--- a/meta/recipes-devtools/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch
+++ b/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch
diff --git a/meta/recipes-devtools/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
index aa4393679f..bf4366f12b 100644
--- a/meta/recipes-devtools/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,10 +1,10 @@
1# The proper prefix is inside our staging area. 1# The proper prefix is inside our staging area.
2# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> 2# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
3 3
4Index: Python-2.6.1/Lib/distutils/sysconfig.py 4Index: Python-2.6.6/Lib/distutils/sysconfig.py
5=================================================================== 5===================================================================
6--- Python-2.6.1.orig/Lib/distutils/sysconfig.py 6--- Python-2.6.6.orig/Lib/distutils/sysconfig.py
7+++ Python-2.6.1/Lib/distutils/sysconfig.py 7+++ Python-2.6.6/Lib/distutils/sysconfig.py
8@@ -19,8 +19,8 @@ import sys 8@@ -19,8 +19,8 @@ import sys
9 from distutils.errors import DistutilsPlatformError 9 from distutils.errors import DistutilsPlatformError
10 10
@@ -25,10 +25,10 @@ Index: Python-2.6.1/Lib/distutils/sysconfig.py
25+ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include') 25+ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include')
26+ else: 26+ else:
27+ prefix = plat_specific and EXEC_PREFIX or PREFIX 27+ prefix = plat_specific and EXEC_PREFIX or PREFIX
28
28 if os.name == "posix": 29 if os.name == "posix":
29 if python_build: 30 if python_build:
30 base = os.path.dirname(os.path.abspath(sys.executable)) 31@@ -116,7 +119,10 @@ def get_python_lib(plat_specific=0, stan
31@@ -112,7 +115,10 @@ def get_python_lib(plat_specific=0, stan
32 sys.exec_prefix -- i.e., ignore 'plat_specific'. 32 sys.exec_prefix -- i.e., ignore 'plat_specific'.
33 """ 33 """
34 if prefix is None: 34 if prefix is None:
@@ -40,7 +40,7 @@ Index: Python-2.6.1/Lib/distutils/sysconfig.py
40 40
41 if os.name == "posix": 41 if os.name == "posix":
42 libpython = os.path.join(prefix, 42 libpython = os.path.join(prefix,
43@@ -218,7 +218,7 @@ def get_config_h_filename(): 43@@ -216,7 +222,7 @@ def get_config_h_filename():
44 else: 44 else:
45 # The name of the config.h file changed in 2.2 45 # The name of the config.h file changed in 2.2
46 config_h = 'pyconfig.h' 46 config_h = 'pyconfig.h'
@@ -49,9 +49,9 @@ Index: Python-2.6.1/Lib/distutils/sysconfig.py
49 49
50 50
51 def get_makefile_filename(): 51 def get_makefile_filename():
52@@ -226,7 +226,7 @@ def get_makefile_filename(): 52@@ -225,7 +231,7 @@ def get_makefile_filename():
53 if python_build: 53 return os.path.join(os.path.dirname(os.path.realpath(sys.executable)),
54 return os.path.join(os.path.dirname(sys.executable), "Makefile") 54 "Makefile")
55 lib_dir = get_python_lib(plat_specific=1, standard_lib=1) 55 lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
56- return os.path.join(lib_dir, "config", "Makefile") 56- return os.path.join(lib_dir, "config", "Makefile")
57+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) 57+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
diff --git a/meta/recipes-devtools/python/python-native-2.6.5/debug.patch b/meta/recipes-devtools/python/python-native/debug.patch
index beb3adc6db..beb3adc6db 100644
--- a/meta/recipes-devtools/python/python-native-2.6.5/debug.patch
+++ b/meta/recipes-devtools/python/python-native/debug.patch
diff --git a/meta/recipes-devtools/python/python-native-2.6.5/nohostlibs.patch b/meta/recipes-devtools/python/python-native/nohostlibs.patch
index 7020f3c2a9..da2bd8f1d2 100644
--- a/meta/recipes-devtools/python/python-native-2.6.5/nohostlibs.patch
+++ b/meta/recipes-devtools/python/python-native/nohostlibs.patch
@@ -1,8 +1,8 @@
1Index: Python-2.6.1/setup.py 1Index: Python-2.6.6/setup.py
2=================================================================== 2===================================================================
3--- Python-2.6.1.orig/setup.py 2009-11-13 16:20:47.000000000 +0000 3--- Python-2.6.6.orig/setup.py
4+++ Python-2.6.1/setup.py 2009-11-13 16:28:00.000000000 +0000 4+++ Python-2.6.6/setup.py
5@@ -310,8 +310,8 @@ 5@@ -356,8 +356,8 @@ class PyBuildExt(build_ext):
6 6
7 def detect_modules(self): 7 def detect_modules(self):
8 # Ensure that /usr/local is always used 8 # Ensure that /usr/local is always used
@@ -13,7 +13,7 @@ Index: Python-2.6.1/setup.py
13 13
14 # Add paths specified in the environment variables LDFLAGS and 14 # Add paths specified in the environment variables LDFLAGS and
15 # CPPFLAGS for header and library files. 15 # CPPFLAGS for header and library files.
16@@ -347,10 +347,10 @@ 16@@ -393,10 +393,10 @@ class PyBuildExt(build_ext):
17 for directory in reversed(options.dirs): 17 for directory in reversed(options.dirs):
18 add_dir_to_list(dir_list, directory) 18 add_dir_to_list(dir_list, directory)
19 19
@@ -27,7 +27,7 @@ Index: Python-2.6.1/setup.py
27 sysconfig.get_config_var("INCLUDEDIR")) 27 sysconfig.get_config_var("INCLUDEDIR"))
28 28
29 try: 29 try:
30@@ -361,11 +361,8 @@ 30@@ -407,11 +407,8 @@ class PyBuildExt(build_ext):
31 # lib_dirs and inc_dirs are used to search for files; 31 # lib_dirs and inc_dirs are used to search for files;
32 # if a file is found in one of those directories, it can 32 # if a file is found in one of those directories, it can
33 # be assumed that no additional -I,-L directives are needed. 33 # be assumed that no additional -I,-L directives are needed.
@@ -41,10 +41,10 @@ Index: Python-2.6.1/setup.py
41 exts = [] 41 exts = []
42 missing = [] 42 missing = []
43 43
44@@ -583,8 +580,7 @@ 44@@ -661,8 +658,7 @@ class PyBuildExt(build_ext):
45 readline_libs.append('ncurses') 45 pass # Issue 7384: Already linked against curses or tinfo.
46 elif self.compiler.find_library_file(lib_dirs, 'curses'): 46 elif curses_library:
47 readline_libs.append('curses') 47 readline_libs.append(curses_library)
48- elif self.compiler.find_library_file(lib_dirs + 48- elif self.compiler.find_library_file(lib_dirs +
49- ['/usr/lib/termcap'], 49- ['/usr/lib/termcap'],
50+ elif self.compiler.find_library_file(lib_dirs, 50+ elif self.compiler.find_library_file(lib_dirs,
diff --git a/meta/recipes-devtools/python/python-native-2.6.5/sitecustomize.py b/meta/recipes-devtools/python/python-native/sitecustomize.py
index 273901898a..273901898a 100644
--- a/meta/recipes-devtools/python/python-native-2.6.5/sitecustomize.py
+++ b/meta/recipes-devtools/python/python-native/sitecustomize.py
diff --git a/meta/recipes-devtools/python/python-native_2.6.5.bb b/meta/recipes-devtools/python/python-native_2.6.6.bb
index cb95e4b964..148dc587e9 100644
--- a/meta/recipes-devtools/python/python-native_2.6.5.bb
+++ b/meta/recipes-devtools/python/python-native_2.6.6.bb
@@ -1,9 +1,9 @@
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}.3" 3PR = "${INC_PR}.0"
4
4 5
5SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ 6SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
6 file://00-fix-bindir-libdir-for-cross.patch \
7 file://04-default-is-optimized.patch \ 7 file://04-default-is-optimized.patch \
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 \
diff --git a/meta/recipes-devtools/python/python/00-fix-bindir-libdir-for-cross.patch b/meta/recipes-devtools/python/python/00-fix-bindir-libdir-for-cross.patch
deleted file mode 100644
index 2559e3a0e4..0000000000
--- a/meta/recipes-devtools/python/python/00-fix-bindir-libdir-for-cross.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1# $(exec_prefix) points to the wrong directory, when installing
2# a cross-build. @bindir@ and @libdir@ works better and doesn't
3# affect the native build.
4# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
5
6Index: Python-2.6.1/Makefile.pre.in
7===================================================================
8--- Python-2.6.1.orig/Makefile.pre.in
9+++ Python-2.6.1/Makefile.pre.in
10@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@
11 datarootdir= @datarootdir@
12
13 # Expanded directories
14-BINDIR= $(exec_prefix)/bin
15-LIBDIR= $(exec_prefix)/lib
16+BINDIR= @bindir@
17+LIBDIR= @libdir@
18 MANDIR= @mandir@
19 INCLUDEDIR= @includedir@
20 CONFINCLUDEDIR= $(exec_prefix)/include
diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
index e89faa4fb0..e091431ab2 100644
--- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
+++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
@@ -2,10 +2,10 @@
2# built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN. 2# built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN.
3# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> 3# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
4 4
5Index: Python-2.6.1/Makefile.pre.in 5Index: Python-2.6.6/Makefile.pre.in
6=================================================================== 6===================================================================
7--- Python-2.6.1.orig/Makefile.pre.in 7--- Python-2.6.6.orig/Makefile.pre.in
8+++ Python-2.6.1/Makefile.pre.in 8+++ Python-2.6.6/Makefile.pre.in
9@@ -175,6 +175,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ 9@@ -175,6 +175,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
10 10
11 PYTHON= python$(EXE) 11 PYTHON= python$(EXE)
@@ -27,14 +27,14 @@ Index: Python-2.6.1/Makefile.pre.in
27 # Build the shared modules 27 # Build the shared modules
28 sharedmods: $(BUILDPYTHON) 28 sharedmods: $(BUILDPYTHON)
29 @case $$MAKEFLAGS in \ 29 @case $$MAKEFLAGS in \
30- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ 30- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
31- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ 31- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
32+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ 32+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
33+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ 33+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
34 esac 34 esac
35 35
36 # Build static library 36 # Build static library
37@@ -513,7 +514,7 @@ Modules/python.o: $(srcdir)/Modules/pyth 37@@ -517,7 +518,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
38 38
39 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) 39 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
40 -@$(INSTALL) -d Include 40 -@$(INSTALL) -d Include
@@ -43,7 +43,7 @@ Index: Python-2.6.1/Makefile.pre.in
43 43
44 $(PGEN): $(PGENOBJS) 44 $(PGEN): $(PGENOBJS)
45 $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) 45 $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
46@@ -879,23 +880,23 @@ libinstall: build_all $(srcdir)/Lib/$(PL 46@@ -887,23 +888,23 @@ libinstall: build_all $(srcdir)/Lib/$(PL
47 done 47 done
48 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt 48 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
49 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 49 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -72,7 +72,7 @@ Index: Python-2.6.1/Makefile.pre.in
72 72
73 # Create the PLATDIR source directory, if one wasn't distributed.. 73 # Create the PLATDIR source directory, if one wasn't distributed..
74 $(srcdir)/Lib/$(PLATDIR): 74 $(srcdir)/Lib/$(PLATDIR):
75@@ -993,7 +994,7 @@ libainstall: all 75@@ -1001,7 +1002,7 @@ libainstall: all
76 # Install the dynamically loadable modules 76 # Install the dynamically loadable modules
77 # This goes into $(exec_prefix) 77 # This goes into $(exec_prefix)
78 sharedinstall: 78 sharedinstall:
@@ -81,11 +81,11 @@ Index: Python-2.6.1/Makefile.pre.in
81 --prefix=$(prefix) \ 81 --prefix=$(prefix) \
82 --install-scripts=$(BINDIR) \ 82 --install-scripts=$(BINDIR) \
83 --install-platlib=$(DESTSHARED) \ 83 --install-platlib=$(DESTSHARED) \
84Index: Python-2.6.1/setup.py 84Index: Python-2.6.6/setup.py
85=================================================================== 85===================================================================
86--- Python-2.6.1.orig/setup.py 86--- Python-2.6.6.orig/setup.py
87+++ Python-2.6.1/setup.py 87+++ Python-2.6.6/setup.py
88@@ -276,6 +276,7 @@ class PyBuildExt(build_ext): 88@@ -322,6 +322,7 @@ class PyBuildExt(build_ext):
89 self.failed.append(ext.name) 89 self.failed.append(ext.name)
90 self.announce('*** WARNING: renaming "%s" since importing it' 90 self.announce('*** WARNING: renaming "%s" since importing it'
91 ' failed: %s' % (ext.name, why), level=3) 91 ' failed: %s' % (ext.name, why), level=3)
@@ -93,7 +93,7 @@ Index: Python-2.6.1/setup.py
93 assert not self.inplace 93 assert not self.inplace
94 basename, tail = os.path.splitext(ext_filename) 94 basename, tail = os.path.splitext(ext_filename)
95 newname = basename + "_failed" + tail 95 newname = basename + "_failed" + tail
96@@ -310,8 +311,8 @@ class PyBuildExt(build_ext): 96@@ -356,8 +357,8 @@ class PyBuildExt(build_ext):
97 97
98 def detect_modules(self): 98 def detect_modules(self):
99 # Ensure that /usr/local is always used 99 # Ensure that /usr/local is always used
@@ -104,7 +104,7 @@ Index: Python-2.6.1/setup.py
104 104
105 # Add paths specified in the environment variables LDFLAGS and 105 # Add paths specified in the environment variables LDFLAGS and
106 # CPPFLAGS for header and library files. 106 # CPPFLAGS for header and library files.
107@@ -410,6 +411,9 @@ class PyBuildExt(build_ext): 107@@ -456,6 +457,9 @@ class PyBuildExt(build_ext):
108 108
109 # XXX Omitted modules: gl, pure, dl, SGI-specific modules 109 # XXX Omitted modules: gl, pure, dl, SGI-specific modules
110 110
diff --git a/meta/recipes-devtools/python/python/04-default-is-optimized.patch b/meta/recipes-devtools/python/python/04-default-is-optimized.patch
index 805f4f696c..c4617ab863 100644
--- a/meta/recipes-devtools/python/python/04-default-is-optimized.patch
+++ b/meta/recipes-devtools/python/python/04-default-is-optimized.patch
@@ -3,10 +3,10 @@
3# of opt-out. 3# of opt-out.
4# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> 4# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
5 5
6Index: Python-2.6.1/Python/compile.c 6Index: Python-2.6.6/Python/compile.c
7=================================================================== 7===================================================================
8--- Python-2.6.1.orig/Python/compile.c 8--- Python-2.6.6.orig/Python/compile.c
9+++ Python-2.6.1/Python/compile.c 9+++ Python-2.6.6/Python/compile.c
10@@ -32,7 +32,7 @@ 10@@ -32,7 +32,7 @@
11 #include "symtable.h" 11 #include "symtable.h"
12 #include "opcode.h" 12 #include "opcode.h"
@@ -16,10 +16,10 @@ Index: Python-2.6.1/Python/compile.c
16 16
17 #define DEFAULT_BLOCK_SIZE 16 17 #define DEFAULT_BLOCK_SIZE 16
18 #define DEFAULT_BLOCKS 8 18 #define DEFAULT_BLOCKS 8
19Index: Python-2.6.1/Modules/main.c 19Index: Python-2.6.6/Modules/main.c
20=================================================================== 20===================================================================
21--- Python-2.6.1.orig/Modules/main.c 21--- Python-2.6.6.orig/Modules/main.c
22+++ Python-2.6.1/Modules/main.c 22+++ Python-2.6.6/Modules/main.c
23@@ -40,7 +40,7 @@ static char **orig_argv; 23@@ -40,7 +40,7 @@ static char **orig_argv;
24 static int orig_argc; 24 static int orig_argc;
25 25
@@ -39,14 +39,14 @@ Index: Python-2.6.1/Modules/main.c
39 -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\ 39 -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\
40 -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ 40 -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\
41 -S : don't imply 'import site' on initialization\n\ 41 -S : don't imply 'import site' on initialization\n\
42@@ -353,8 +352,8 @@ Py_Main(int argc, char **argv) 42@@ -328,8 +327,8 @@ Py_Main(int argc, char **argv)
43 43
44 /* case 'J': reserved for Jython */ 44 /* case 'J': reserved for Jython */
45 45
46- case 'O': 46- case 'O':
47- Py_OptimizeFlag++; 47- Py_OptimizeFlag++;
48+ case 'N': 48+ case 'N':
49+ Py_OptimizeFlag=0; 49+ Py_OptimizeFlag=0;
50 break; 50 break;
51 51
52 case 'B': 52 case 'B':
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
index 30aa50dd44..68c9d5cfd5 100644
--- 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
@@ -7,14 +7,14 @@ This Patch fixes this issue in the python build environment.
711 Oct 2010 711 Oct 2010
8Nitin A Kamble <nitin.a.kamble@intel.com> 8Nitin A Kamble <nitin.a.kamble@intel.com>
9 9
10Index: Python-2.6.5/setup.py 10Index: Python-2.6.6/setup.py
11=================================================================== 11===================================================================
12--- Python-2.6.5.orig/setup.py 12--- Python-2.6.6.orig/setup.py
13+++ Python-2.6.5/setup.py 13+++ Python-2.6.6/setup.py
14@@ -591,12 +591,10 @@ class PyBuildExt(build_ext): 14@@ -665,12 +665,10 @@ class PyBuildExt(build_ext):
15 readline_libs.append('ncurses') 15 pass # Issue 7384: Already linked against curses or tinfo.
16 elif self.compiler.find_library_file(lib_dirs, 'curses'): 16 elif curses_library:
17 readline_libs.append('curses') 17 readline_libs.append(curses_library)
18- elif self.compiler.find_library_file(lib_dirs + 18- elif self.compiler.find_library_file(lib_dirs +
19- ['/usr/lib/termcap'], 19- ['/usr/lib/termcap'],
20+ elif self.compiler.find_library_file(lib_dirs, 20+ elif self.compiler.find_library_file(lib_dirs,
diff --git a/meta/recipes-devtools/python/python/99-ignore-optimization-flag.patch b/meta/recipes-devtools/python/python/99-ignore-optimization-flag.patch
index 02dc44c847..0bd1a2d4d0 100644
--- a/meta/recipes-devtools/python/python/99-ignore-optimization-flag.patch
+++ b/meta/recipes-devtools/python/python/99-ignore-optimization-flag.patch
@@ -3,17 +3,17 @@
3# 3#
4# Signed-off-by: Denys Dmytriyenko <denis@denix.org> 4# Signed-off-by: Denys Dmytriyenko <denis@denix.org>
5 5
6Index: Python-2.6.1/Modules/main.c 6Index: Python-2.6.6/Modules/main.c
7=================================================================== 7===================================================================
8--- Python-2.6.1-orig/Modules/main.c 8--- Python-2.6.6.orig/Modules/main.c
9+++ Python-2.6.1/Modules/main.c 9+++ Python-2.6.6/Modules/main.c
10@@ -352,6 +352,9 @@ Py_Main(int argc, char **argv) 10@@ -327,6 +327,9 @@ Py_Main(int argc, char **argv)
11 11
12 /* case 'J': reserved for Jython */ 12 /* case 'J': reserved for Jython */
13 13
14+ case 'O': /* ignore it */ 14+ case 'O': /* ignore it */
15+ break; 15+ break;
16+ 16+
17 case 'N': 17 case 'N':
18 Py_OptimizeFlag=0; 18 Py_OptimizeFlag=0;
19 break; 19 break;
diff --git a/meta/recipes-devtools/python/python_2.6.5.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index ec5442dc7c..fa0e294158 100644
--- a/meta/recipes-devtools/python/python_2.6.5.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -1,12 +1,10 @@
1require python.inc 1require python.inc
2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" 2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" 3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
4# set to .0 on every increase of INC_PR 4PR = "${INC_PR}.0"
5PR = "${INC_PR}.3"
6 5
7SRC_URI = "\ 6SRC_URI = "\
8 http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ 7 http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
9 file://00-fix-bindir-libdir-for-cross.patch \
10 file://01-use-proper-tools-for-cross-build.patch \ 8 file://01-use-proper-tools-for-cross-build.patch \
11 file://02-remove-test-for-cross.patch \ 9 file://02-remove-test-for-cross.patch \
12 file://03-fix-tkinter-detection.patch \ 10 file://03-fix-tkinter-detection.patch \