diff options
-rw-r--r-- | meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/automake/automake_1.11.2.bb | 5 |
2 files changed, 45 insertions, 2 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 0000000000..f09bfbca5d --- /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 + diff --git a/meta/recipes-devtools/automake/automake_1.11.2.bb b/meta/recipes-devtools/automake/automake_1.11.2.bb index 4534c390ba..4271336070 100644 --- a/meta/recipes-devtools/automake/automake_1.11.2.bb +++ b/meta/recipes-devtools/automake/automake_1.11.2.bb @@ -37,9 +37,10 @@ PATHFIXPATCH_virtclass-nativesdk = "" SRC_URI += "${PATHFIXPATCH} \ file://prefer-cpio-over-pax-for-ustar-archives.patch \ file://python-libdir.patch \ - file://automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch" + file://automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch \ + file://py-compile-compile-only-optimized-byte-code.patch" -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456" SRC_URI[sha256sum] = "4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718" |