diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-02-25 02:19:10 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-26 11:42:34 +0000 |
commit | eb8ce05d1315110bb1d297dcd4971edf3a54ca9a (patch) | |
tree | 191b265fc071d3bf2034ac44264a0fcb7c36996b /meta/recipes-devtools/automake/automake | |
parent | 6aa3a09876cebb3c2ef3a2d91bbdd10e1b5c6190 (diff) | |
download | ast2050-yocto-poky-eb8ce05d1315110bb1d297dcd4971edf3a54ca9a.zip ast2050-yocto-poky-eb8ce05d1315110bb1d297dcd4971edf3a54ca9a.tar.gz |
automake: omit compilation of pyc files on install
* On install, automake calls py-compile, which previously
compiled python source code to pyc and pyo, which both
got packaged.
* The python interpreter in OE contains patches to enable
optimization (pyo) by default:
04-default-is-optimized.patch
99-ignore-optimization-flag.patch
* automake created pyc files by calling py_compile.compile()
and adding the c suffix manually, resulting in identical
byte code for both pyc and pyo files.
* py-compile-compile-only-optimized-byte-code.patch
applies to automake 1.11 and automake master, but older
versions require a slightly modified patch. However,
older versions are only pinned by chinook-compat and
nylon, so I left them untouched.
(From OE-Core rev: 40ccf816c597e7eed5243fb4b4e9473d2b58afaa)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
The patch was imported from the OpenEmbedded git server
(git://git.openembedded.org/openembedded) as of commit id
aa4585c5065e05c759f16e1e8623fc7f40640f1b.
Modified to apply to automake version 1.11.2 and to
include a patch header. Also renamed the patch.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/automake/automake')
-rw-r--r-- | meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch b/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch new file mode 100644 index 0000000..f09bfbc --- /dev/null +++ b/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch @@ -0,0 +1,42 @@ +Upstream-Status: Inappropriate [embedded specific] + +* OE-Core's python creates the same binary output + for both pyc and pyo, so disable the creation of + pyc files by automake. + +Signed-off-by: Andreas Oberritter <obi@opendreambox.org> +--- + lib/py-compile | 17 ----------------- + 1 files changed, 0 insertions(+), 17 deletions(-) + +diff --git a/lib/py-compile b/lib/py-compile +index 3f9d05b..101c814 100755 +--- a/lib/py-compile ++++ b/lib/py-compile +@@ -101,23 +101,6 @@ else + filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" + fi + +-$PYTHON -c " +-import sys, os, py_compile +- +-files = '''$files''' +- +-sys.stdout.write('Byte-compiling python modules...\n') +-for file in files.split(): +- $pathtrans +- $filetrans +- if not os.path.exists(filepath) or not (len(filepath) >= 3 +- and filepath[-3:] == '.py'): +- continue +- sys.stdout.write(file) +- sys.stdout.flush() +- py_compile.compile(filepath, filepath + 'c', path) +-sys.stdout.write('\n')" || exit $? +- + # this will fail for python < 1.5, but that doesn't matter ... + $PYTHON -O -c " + import sys, os, py_compile +-- +1.7.0.4 + |