summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python/04-default-is-optimized.patch
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-01 10:23:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-03 15:48:04 +0100
commit7b08f6a9a11c76aa6b0910feb49accae5db25de3 (patch)
treed5333890dd7a553eef6b8a32a16e5ff446fb4fbb /meta/recipes-devtools/python/python/04-default-is-optimized.patch
parent4f4ab8bfe33283105112e81ee242a2e72527dd18 (diff)
downloadpoky-7b08f6a9a11c76aa6b0910feb49accae5db25de3.tar.gz
python: upgrade from 2.7.2 to 2.7.3
bin/python2 link is provided by the python install process, so no need to create it. rebase these patches to the newer code: fix_for_using_different_libdir.patch 04-default-is-optimized.patch remove this patch as it is upstream now: sys_platform_is_now_always_linux2.patch Change default python version to 2.7.3 in the distro config (From OE-Core rev: 5d92a95ea9b480235b7c9ca5949a681376eba725) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python/04-default-is-optimized.patch')
-rw-r--r--meta/recipes-devtools/python/python/04-default-is-optimized.patch30
1 files changed, 18 insertions, 12 deletions
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 042ac5e46f..7ce819a3c9 100644
--- a/meta/recipes-devtools/python/python/04-default-is-optimized.patch
+++ b/meta/recipes-devtools/python/python/04-default-is-optimized.patch
@@ -1,14 +1,20 @@
1Upstream-Status: Inappropriate [embedded specific] 1Upstream-Status: Inappropriate [embedded specific]
2 2
3Updated original patch for python 2.7.3
4
5Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
62012/05/01
7
8
3# when compiling for an embedded system, we need every bit of 9# when compiling for an embedded system, we need every bit of
4# performance we can get. default to optimized with the option 10# performance we can get. default to optimized with the option
5# of opt-out. 11# of opt-out.
6# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> 12# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
7 13
8Index: Python-2.6.6/Python/compile.c 14Index: Python-2.7.3/Python/compile.c
9=================================================================== 15===================================================================
10--- Python-2.6.6.orig/Python/compile.c 16--- Python-2.7.3.orig/Python/compile.c
11+++ Python-2.6.6/Python/compile.c 17+++ Python-2.7.3/Python/compile.c
12@@ -32,7 +32,7 @@ 18@@ -32,7 +32,7 @@
13 #include "symtable.h" 19 #include "symtable.h"
14 #include "opcode.h" 20 #include "opcode.h"
@@ -18,16 +24,16 @@ Index: Python-2.6.6/Python/compile.c
18 24
19 #define DEFAULT_BLOCK_SIZE 16 25 #define DEFAULT_BLOCK_SIZE 16
20 #define DEFAULT_BLOCKS 8 26 #define DEFAULT_BLOCKS 8
21Index: Python-2.6.6/Modules/main.c 27Index: Python-2.7.3/Modules/main.c
22=================================================================== 28===================================================================
23--- Python-2.6.6.orig/Modules/main.c 29--- Python-2.7.3.orig/Modules/main.c
24+++ Python-2.6.6/Modules/main.c 30+++ Python-2.7.3/Modules/main.c
25@@ -40,7 +40,7 @@ static char **orig_argv; 31@@ -40,7 +40,7 @@ static char **orig_argv;
26 static int orig_argc; 32 static int orig_argc;
27 33
28 /* command line options */ 34 /* command line options */
29-#define BASE_OPTS "3bBc:dEhiJm:OQ:sStuUvVW:xX?" 35-#define BASE_OPTS "3bBc:dEhiJm:OQ:RsStuUvVW:xX?"
30+#define BASE_OPTS "3bBc:dEhiJm:NOQ:sStuUvVW:xX?" 36+#define BASE_OPTS "3bBc:dEhiJm:NOQ:RsStuUvVW:xX?"
31 37
32 #ifndef RISCOS 38 #ifndef RISCOS
33 #define PROGRAM_OPTS BASE_OPTS 39 #define PROGRAM_OPTS BASE_OPTS
@@ -38,10 +44,10 @@ Index: Python-2.6.6/Modules/main.c
38--O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\ 44--O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\
39--OO : remove doc-strings in addition to the -O optimizations\n\ 45--OO : remove doc-strings in addition to the -O optimizations\n\
40+-N : do NOT optimize generated bytecode\n\ 46+-N : do NOT optimize generated bytecode\n\
41 -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\ 47 -R : use a pseudo-random salt to make hash() values of various types be\n\
42 -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ 48 unpredictable between separate invocations of the interpreter, as\n\
43 -S : don't imply 'import site' on initialization\n\ 49 a defense against denial-of-service attacks\n\
44@@ -328,8 +327,8 @@ Py_Main(int argc, char **argv) 50@@ -365,8 +364,8 @@ Py_Main(int argc, char **argv)
45 51
46 /* case 'J': reserved for Jython */ 52 /* case 'J': reserved for Jython */
47 53