diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-05-01 22:15:12 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-05-17 22:46:17 +0200 |
commit | 476f5fc8f6eba6ee44ce2e0812a1492609331f7d (patch) | |
tree | fb2bfb551a10f628f8ecfc20cb6f0f6297a891c0 /package/python3/0023-Add-an-option-to-disable-expat.patch | |
parent | 61c8854cef2a41be3175bbf7f0992c31560a1dd7 (diff) | |
download | buildroot-476f5fc8f6eba6ee44ce2e0812a1492609331f7d.tar.gz buildroot-476f5fc8f6eba6ee44ce2e0812a1492609331f7d.zip |
python3: bump to 3.5.1
The major changes in terms of Buildroot packaging are:
- Due to PEP488, Python no longer generates .pyc (unoptimized) and
.pyo (optimized) byte-code files. Instead, it generates <foo>.pyc,
<foo>.opt-1.pyc and <foo>.opt-2.pyc. Therefore, we removed the
--disable-pyo-build option and kept only the --disable-pyc-build
option, which completely disables building all .pyc files. In
addition, since the optimized .opt-X.pyc files don't work if the
corresponding un-optimized .pyc file is not present, we are for the
moment unconditionally removing the optimized ones (keeping both
the unoptimized and optimized ones doubles the required filesystem
size!). So basically we preserve the behavior we had before this
commit:
BR2_PACKAGE_PYTHON3_PY_ONLY -> only *.py
BR2_PACKAGE_PYTHON3_PYC_ONLY -> only non-optimized *.pyc
BR2_PACKAGE_PYTHON3_PY_PYC -> both the *.py and non-optimized *.pyc
To achieve this, the TARGET_FINALIZE_HOOKS are reworked:
PYTHON3_REMOVE_PY_FILES is responsible for removing *.py files in
the BR2_PACKAGE_PYTHON3_PYC_ONLY case.
PYTHON3_REMOVE_PYC_FILES is responsible for removing *.pyc files
in the BR2_PACKAGE_PYTHON3_PY_ONLY case.
PYTHON3_REMOVE_OPTIMIZED_PYC_FILES is responsible for removing the
optimized *.opt-1.pyc and *.opt-2.pyc files, which is done
unconditionally.
- The PEP3147 disabling patch had to be significantly reworked due to
the code having changed heavily. The code was moved into a
_bootstrap_external.py, which is a "frozen" Python module, i.e a
module generated into a .h file at compile time using the
_freeze_importlib program.
- Due to the above, we now need to regenerate importlib.h at build
time. Unfortunately, for the target Python _freeze_importlib is
built for the target, so we can't run it on the build machine. To
fix this, we copy the _freeze_importlib program from the
host-python in $(HOST_DIR), and then patch the target python to use
it. Since the same solution can be used for 'pgen', we do it, and
avoid having to touch the graminit.{c,h} files.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/python3/0023-Add-an-option-to-disable-expat.patch')
-rw-r--r-- | package/python3/0023-Add-an-option-to-disable-expat.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/python3/0023-Add-an-option-to-disable-expat.patch b/package/python3/0023-Add-an-option-to-disable-expat.patch index 9cb0799c5d..73f9b36bd0 100644 --- a/package/python3/0023-Add-an-option-to-disable-expat.patch +++ b/package/python3/0023-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From f98b83bca09882d27bb04d7dbcd50f9979ad0569 Mon Sep 17 00:00:00 2001 +From 6281850ee8c3fb6d93b4997833af0cca4a48947b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Wed, 23 Dec 2015 11:49:42 +0100 Subject: [PATCH] Add an option to disable expat @@ -18,10 +18,10 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com> 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 66b2c45..884d5aa 100644 +index b97c21e..bdfee19 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1147,7 +1147,7 @@ LIBSUBDIRS= \ +@@ -1180,7 +1180,7 @@ LIBSUBDIRS= \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -30,7 +30,7 @@ index 66b2c45..884d5aa 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1219,6 +1219,10 @@ ifeq (@CURSES@,yes) +@@ -1257,6 +1257,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -42,10 +42,10 @@ index 66b2c45..884d5aa 100644 LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac -index e48f38e..4bbd597 100644 +index 0be47b2..e6bcacc 100644 --- a/configure.ac +++ b/configure.ac -@@ -2355,13 +2355,21 @@ PKG_PROG_PKG_CONFIG +@@ -2591,13 +2591,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -73,10 +73,10 @@ index e48f38e..4bbd597 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index a2bf05a..fd3ac65 100644 +index 722308b..ecddb6a 100644 --- a/setup.py +++ b/setup.py -@@ -1414,7 +1414,7 @@ class PyBuildExt(build_ext): +@@ -1434,7 +1434,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # |