diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-07-16 07:52:48 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-16 07:52:48 +0000 |
| commit | 0f4e03158ddc147fe194b47f0f0da10076cdab48 (patch) | |
| tree | f2ab39afe60285ed37922f54aa3c9762d7c52e55 | |
| parent | ff44a61a9b672aab9b86c2870b6972fbb040440b (diff) | |
| parent | 74a560bfe000c60dedd513604cea372dbac6590a (diff) | |
merge of '641a15c42908d49a2d22b32302275bdcee06d601'
and 'bcdca45c1b2872acd0f00daa6d38395d0d5867d1'
| -rw-r--r-- | packages/python/python-2.5.2/default-is-optimized.patch | 41 | ||||
| -rw-r--r-- | packages/python/python-evas_cvs.bb | 4 | ||||
| -rw-r--r-- | packages/python/python_2.5.2.bb | 2 |
3 files changed, 43 insertions, 4 deletions
diff --git a/packages/python/python-2.5.2/default-is-optimized.patch b/packages/python/python-2.5.2/default-is-optimized.patch index 6beeb6e022..072bf0b059 100644 --- a/packages/python/python-2.5.2/default-is-optimized.patch +++ b/packages/python/python-2.5.2/default-is-optimized.patch @@ -1,7 +1,7 @@ -Index: Python-2.5.1/Python/compile.c +Index: Python-2.5.2/Python/compile.c =================================================================== ---- Python-2.5.1.orig/Python/compile.c -+++ Python-2.5.1/Python/compile.c +--- Python-2.5.2.orig/Python/compile.c ++++ Python-2.5.2/Python/compile.c @@ -30,7 +30,7 @@ #include "symtable.h" #include "opcode.h" @@ -11,3 +11,38 @@ Index: Python-2.5.1/Python/compile.c /* ISSUES: +Index: Python-2.5.2/Modules/main.c +=================================================================== +--- Python-2.5.2.orig/Modules/main.c ++++ Python-2.5.2/Modules/main.c +@@ -40,7 +40,7 @@ static char **orig_argv; + static int orig_argc; + + /* command line options */ +-#define BASE_OPTS "c:dEhim:OQ:StuUvVW:xX?" ++#define BASE_OPTS "c:dEhim:ONQ:StuUvVW:xX?" + + #ifndef RISCOS + #define PROGRAM_OPTS BASE_OPTS +@@ -68,8 +68,7 @@ Options and arguments (and corresponding + "; + static char *usage_2 = "\ + -m mod : run library module as a script (terminates option list)\n\ +--O : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\ +--OO : remove doc-strings in addition to the -O optimizations\n\ ++-N : do NOT optimize generated bytecode\n\ + -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\ + -S : don't imply 'import site' on initialization\n\ + -t : issue warnings about inconsistent tab usage (-tt: issue errors)\n\ +@@ -302,7 +301,10 @@ Py_Main(int argc, char **argv) + break; + + case 'O': +- Py_OptimizeFlag++; ++ fprintf(stderr, "-O is already default in this version. Ignoring\n"); ++ ++ case 'N': ++ Py_OptimizeFlag=0; + break; + + case 'S': diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb index 92f4466a24..57e28b28ed 100644 --- a/packages/python/python-evas_cvs.bb +++ b/packages/python/python-evas_cvs.bb @@ -3,6 +3,10 @@ DEPENDS += "evas" PV = "0.2.1+cvs${SRCDATE}" PR = "r0" +do_compile_prepend() { + touch include/evas/__init__.py +} + do_stage() { distutils_stage_all } diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 22aac7c9ee..9617871fff 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml4" +PR = "ml6" PYTHON_MAJMIN = "2.5" |