diff options
author | Christophe Vu-Brugier <cvubrugier@fastmail.fm> | 2015-11-14 16:54:30 +0100 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-11-17 23:13:28 +0100 |
commit | c3d65a4dad707db83122ac082202f3e8dc70e60f (patch) | |
tree | 4e427fac30a1683744ae720fad3a1ce0f5cfb3bd /package/python3/016-distutils-no-pep3147.patch | |
parent | 5583d2dbfc15e7d4f059d7323db5d63c8b0ec5c3 (diff) | |
download | buildroot-c3d65a4dad707db83122ac082202f3e8dc70e60f.tar.gz buildroot-c3d65a4dad707db83122ac082202f3e8dc70e60f.zip |
python3: add patch to fix PEP 3147 issue with automake built packages
Packages built with automake use a `py-compile` helper to byte-compile
Python source files. This script uses the "py_compile" module from the
standard library. In turn, the compile() function in the "py_compile"
module invokes the cache_from_source() function provided by importlib.
This commit adds a new patch named "020-importlib-no-pep3147.patch"
that changes cache_from_source() and source_from_cache() in importlib
to get rid of the "__pycache__" directory.
This commit fixes the following import error in kmod when the module
is built for Python 3:
>>> from kmod import Kmod
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
ImportError: cannot import name 'Kmod'
Moreover, this commit removes two patches that are no longer necessary
since modifying cache_from_source() and source_from_cache() disables
PEP 3147 for the standard library and distutils / setuptools.
* 004-old-stdlib-cache.patch
* 016-distutils-no-pep3147.patch
Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/python3/016-distutils-no-pep3147.patch')
-rw-r--r-- | package/python3/016-distutils-no-pep3147.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/package/python3/016-distutils-no-pep3147.patch b/package/python3/016-distutils-no-pep3147.patch deleted file mode 100644 index 0fdfeb24ca..0000000000 --- a/package/python3/016-distutils-no-pep3147.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add distutils fix for PEP 3147 issue - -Python 3 has a new standard for installing .pyc file, called PEP -3147. Unfortunately, this standard requires both the .py and .pyc -files to be installed for a Python module to be found. This is quite -annoying on space-constrained embedded systems, since the .py file is -technically not required for execution. - -For the Python standard library, our Python 3 package already contains -a patch named python3-004-old-stdlib-cache.patch, which allows to -disable the PEP 3147 installation. - -But that lives the distutils/setuptools package an unsolved -problem. This patch therefore adds a new patch to Python, which makes -distutils package use the traditional installation path when byte -compiling, rather than the PEP 3147 installation path. Since -setuptools relies on distutils internally, it also fixes setuptools -based packages. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -Index: b/Lib/distutils/util.py -=================================================================== ---- a/Lib/distutils/util.py -+++ b/Lib/distutils/util.py -@@ -437,7 +437,9 @@ - # Terminology from the py_compile module: - # cfile - byte-compiled file - # dfile - purported source filename (same as 'file' by default) -- if optimize >= 0: -+ if "_python_sysroot" in os.environ: -+ cfile = file + (__debug__ and "c" or "o") -+ elif optimize >= 0: - cfile = importlib.util.cache_from_source( - file, debug_override=not optimize) - else: |