diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2015-11-10 23:34:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:06 +0000 |
commit | 2268a702f1d5528a8a1f5af19b099d25b486dec3 (patch) | |
tree | 333b2f93236469c62a5ae0e5f8fb6ab8fc13ea59 /meta/recipes-devtools/python/python3/04-default-is-optimized.patch | |
parent | ed8d1bef240a835ea01ff5f722048084722448db (diff) | |
download | poky-2268a702f1d5528a8a1f5af19b099d25b486dec3.tar.gz |
python3: Upgrade from 3.4.3 to 3.5
python3-native_3.4.3.bb -> python3-native_3.5.0.bb:
- changed version
- changed cheksum
- no license change, just dates
python3_3.4.3.bb -> python3_3.5.0.bb:
- changed version
- changed cheksum
- no license change, just dates
New:
- use_packed_importlib.patch: Fixes importlib on cross-compile environments
Rebased:
- Manifest
- 000-cross-compile.patch
- 020-dont-compile-python-files.patch
- 04-default-is-optimized.patch
- python-3.3-multilib.patch
- distutils3-base.bbclass
- distutils3-native-base.bbclass
- python3native.bbclass
Upstream:
- makerace.patch
Misc:
- pip2 is handled as default on major distros,
modified python3-pip to leave /usr/bin/pip available for pip2
- Fixed importing pip3 from python3 interpreter
(From OE-Core rev: 701ec1977ced1bb08461e6de98b4f63d21cba8a6)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/04-default-is-optimized.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/04-default-is-optimized.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-devtools/python/python3/04-default-is-optimized.patch b/meta/recipes-devtools/python/python3/04-default-is-optimized.patch index 3b8f264a58..4b8a7e56bc 100644 --- a/meta/recipes-devtools/python/python3/04-default-is-optimized.patch +++ b/meta/recipes-devtools/python/python3/04-default-is-optimized.patch | |||
@@ -12,24 +12,11 @@ Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | |||
12 | Rebased for 3.4.2 02/2015 | 12 | Rebased for 3.4.2 02/2015 |
13 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 13 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> |
14 | 14 | ||
15 | Index: Python-3.4.2/Python/compile.c | 15 | Index: Python-3.5.0/Modules/main.c |
16 | =================================================================== | 16 | =================================================================== |
17 | --- Python-3.4.2.orig/Python/compile.c | 17 | --- Python-3.5.0.orig/Modules/main.c |
18 | +++ Python-3.4.2/Python/compile.c | 18 | +++ Python-3.5.0/Modules/main.c |
19 | @@ -30,7 +30,7 @@ | 19 | @@ -37,7 +37,7 @@ static wchar_t **orig_argv; |
20 | #include "symtable.h" | ||
21 | #include "opcode.h" | ||
22 | |||
23 | -int Py_OptimizeFlag = 0; | ||
24 | +int Py_OptimizeFlag = 1; | ||
25 | |||
26 | #define DEFAULT_BLOCK_SIZE 16 | ||
27 | #define DEFAULT_BLOCKS 8 | ||
28 | Index: Python-3.4.2/Modules/main.c | ||
29 | =================================================================== | ||
30 | --- Python-3.4.2.orig/Modules/main.c | ||
31 | +++ Python-3.4.2/Modules/main.c | ||
32 | @@ -38,7 +38,7 @@ static wchar_t **orig_argv; | ||
33 | static int orig_argc; | 20 | static int orig_argc; |
34 | 21 | ||
35 | /* command line options */ | 22 | /* command line options */ |
@@ -38,7 +25,7 @@ Index: Python-3.4.2/Modules/main.c | |||
38 | 25 | ||
39 | #define PROGRAM_OPTS BASE_OPTS | 26 | #define PROGRAM_OPTS BASE_OPTS |
40 | 27 | ||
41 | @@ -64,6 +64,7 @@ static char *usage_2 = "\ | 28 | @@ -63,6 +63,7 @@ static char *usage_2 = "\ |
42 | -m mod : run library module as a script (terminates option list)\n\ | 29 | -m mod : run library module as a script (terminates option list)\n\ |
43 | -O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\ | 30 | -O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\ |
44 | -OO : remove doc-strings in addition to the -O optimizations\n\ | 31 | -OO : remove doc-strings in addition to the -O optimizations\n\ |
@@ -46,7 +33,7 @@ Index: Python-3.4.2/Modules/main.c | |||
46 | -q : don't print version and copyright messages on interactive startup\n\ | 33 | -q : don't print version and copyright messages on interactive startup\n\ |
47 | -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ | 34 | -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ |
48 | -S : don't imply 'import site' on initialization\n\ | 35 | -S : don't imply 'import site' on initialization\n\ |
49 | @@ -418,8 +419,8 @@ Py_Main(int argc, wchar_t **argv) | 36 | @@ -419,8 +420,8 @@ Py_Main(int argc, wchar_t **argv) |
50 | 37 | ||
51 | /* case 'J': reserved for Jython */ | 38 | /* case 'J': reserved for Jython */ |
52 | 39 | ||
@@ -57,3 +44,16 @@ Index: Python-3.4.2/Modules/main.c | |||
57 | break; | 44 | break; |
58 | 45 | ||
59 | case 'B': | 46 | case 'B': |
47 | Index: Python-3.5.0/Python/pylifecycle.c | ||
48 | =================================================================== | ||
49 | --- Python-3.5.0.orig/Python/pylifecycle.c | ||
50 | +++ Python-3.5.0/Python/pylifecycle.c | ||
51 | @@ -80,7 +80,7 @@ int Py_VerboseFlag; /* Needed by import. | ||
52 | int Py_QuietFlag; /* Needed by sysmodule.c */ | ||
53 | int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */ | ||
54 | int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */ | ||
55 | -int Py_OptimizeFlag = 0; /* Needed by compile.c */ | ||
56 | +int Py_OptimizeFlag = 1; /* Needed by compile.c */ | ||
57 | int Py_NoSiteFlag; /* Suppress 'import site' */ | ||
58 | int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */ | ||
59 | int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */ | ||