[oe-commits] [openembedded-core] 20/20: automake: don't delete .pyc files
git at git.openembedded.org
git at git.openembedded.org
Mon Feb 29 17:39:46 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit b77d511387e2bb45e3c3fe712802ef03ea00c75e
Author: Joseph A. Lutz <joseph.lutz at novatechweb.com>
AuthorDate: Thu Feb 25 17:02:35 2016 -0600
automake: don't delete .pyc files
The patch being removed in this commit removes *.pyc files from being
compiled. This dose not allow a user to select which files are included
in the image. Since optimization is no longer the default for python
we should have the ability to choose what is included in the image.
Signed-off-by: Joseph A. Lutz <joseph.lutz at novatechweb.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
...-compile-compile-only-optimized-byte-code.patch | 42 ----------------------
meta/recipes-devtools/automake/automake_1.15.bb | 1 -
2 files changed, 43 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
deleted file mode 100644
index f8334a7..0000000
--- a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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 at opendreambox.org>
-
-Updated for automake-1.12.6
-
-Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
-
-diff -Nurd automake-1.12.6/lib/py-compile automake-1.12.6/lib/py-compile
---- automake-1.12.6/lib/py-compile 2012-12-13 21:57:31.000000000 +0200
-+++ automake-1.12.6/lib/py-compile 2012-12-27 19:34:01.426015140 +0200
-@@ -115,26 +115,6 @@
- filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
- fi
-
--$PYTHON -c "
--import sys, os, py_compile, imp
--
--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()
-- if hasattr(imp, 'get_tag'):
-- py_compile.compile(filepath, imp.cache_from_source(filepath), path)
-- else:
-- 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, imp
diff --git a/meta/recipes-devtools/automake/automake_1.15.bb b/meta/recipes-devtools/automake/automake_1.15.bb
index 85494b4..a3c72fd 100644
--- a/meta/recipes-devtools/automake/automake_1.15.bb
+++ b/meta/recipes-devtools/automake/automake_1.15.bb
@@ -19,7 +19,6 @@ RDEPENDS_${PN} += "\
RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native"
SRC_URI += " file://python-libdir.patch \
- file://py-compile-compile-only-optimized-byte-code.patch \
file://buildtest.patch \
file://performance.patch \
file://new_rt_path_for_test-driver.patch"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list