diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-11-08 10:34:46 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2010-11-14 21:08:26 -0800 |
commit | 793bb465b3a6b0c883340621575b9944d7ccaf5a (patch) | |
tree | b668cfadf3836b3d018dd76005f3bb65b4f8dd03 /meta/recipes-devtools/python/python | |
parent | a7af5c516e547e669d92569dba21a9c1c790cf7f (diff) | |
download | poky-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/python')
5 files changed, 47 insertions, 67 deletions
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 | |||
6 | Index: 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 | ||
5 | Index: Python-2.6.1/Makefile.pre.in | 5 | Index: 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) \ |
84 | Index: Python-2.6.1/setup.py | 84 | Index: 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 | ||
6 | Index: Python-2.6.1/Python/compile.c | 6 | Index: 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 |
19 | Index: Python-2.6.1/Modules/main.c | 19 | Index: 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. | |||
7 | 11 Oct 2010 | 7 | 11 Oct 2010 |
8 | Nitin A Kamble <nitin.a.kamble@intel.com> | 8 | Nitin A Kamble <nitin.a.kamble@intel.com> |
9 | 9 | ||
10 | Index: Python-2.6.5/setup.py | 10 | Index: 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 | ||
6 | Index: Python-2.6.1/Modules/main.c | 6 | Index: 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; |