diff options
| author | Ross Burton <ross.burton@intel.com> | 2019-11-26 09:18:18 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-29 17:43:40 +0000 |
| commit | f80d49411b42d27a1544af6dc03b4b396b03c775 (patch) | |
| tree | c5132f095be7864899ae6155ae7456908e779295 | |
| parent | 7767aa381906a4a377847eeca38c9257c460d6d3 (diff) | |
| download | poky-f80d49411b42d27a1544af6dc03b4b396b03c775.tar.gz | |
python: restore bytecode optimisation
The upgrade from 2.7.3 to 2.7.9 in oe-core cb02ecb introduced some
copy-paste errors which inadvertandly disabled the generation of
optimised bytecode (.pyo files).
Restore the intended behaviour and bring back .pyo files.
(From OE-Core rev: f49077af44969212530a7f1b5cb9370fefb85434)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch | 6 |
2 files changed, 6 insertions, 6 deletions
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 7d8e95fe5c..56992210a2 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 | |||
| @@ -36,18 +36,18 @@ Index: Python-2.7.13/Makefile.pre.in | |||
| 36 | $(DESTDIR)$(LIBDEST) | 36 | $(DESTDIR)$(LIBDEST) |
| 37 | PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 37 | PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 38 | - $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ | 38 | - $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 39 | + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ | 39 | + $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 40 | -d $(LIBDEST) -f \ | 40 | -d $(LIBDEST) -f \ |
| 41 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | 41 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
| 42 | $(DESTDIR)$(LIBDEST) | 42 | $(DESTDIR)$(LIBDEST) |
| 43 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 43 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 44 | - $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ | 44 | - $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 45 | + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ | 45 | + $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 46 | -d $(LIBDEST)/site-packages -f \ | 46 | -d $(LIBDEST)/site-packages -f \ |
| 47 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 47 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 48 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 48 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 49 | - $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ | 49 | - $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 50 | + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ | 50 | + $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 51 | -d $(LIBDEST)/site-packages -f \ | 51 | -d $(LIBDEST)/site-packages -f \ |
| 52 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 52 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 53 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 53 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
diff --git a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch index 5f7309367c..b4e72193ff 100644 --- a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch +++ b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch | |||
| @@ -52,8 +52,8 @@ Index: Python-2.7.9/Makefile.pre.in | |||
| 52 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | 52 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
| 53 | $(DESTDIR)$(LIBDEST) | 53 | $(DESTDIR)$(LIBDEST) |
| 54 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 54 | - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 55 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}$(RUNSHARED) \ | 55 | + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
| 56 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ | 56 | $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 57 | -d $(LIBDEST) -f \ | 57 | -d $(LIBDEST) -f \ |
| 58 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | 58 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
| 59 | $(DESTDIR)$(LIBDEST) | 59 | $(DESTDIR)$(LIBDEST) |
| @@ -64,7 +64,7 @@ Index: Python-2.7.9/Makefile.pre.in | |||
| 64 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 64 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 65 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 65 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 66 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ | 66 | + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ |
| 67 | $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ | 67 | $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 68 | -d $(LIBDEST)/site-packages -f \ | 68 | -d $(LIBDEST)/site-packages -f \ |
| 69 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | 69 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 70 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | 70 | - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |