mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-12-14 07:43:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

python3: Fix pyc-only related runtime exceptions

Browse Source 
Python3 changes the pyc lookup strategy, ignoring the
__pycache__ directory if the .py file is missing. Change
install location to enable use of .pyc without their parent .py

See http://www.python.org/dev/peps/pep-3147

[Peter: add patch header]
Signed-off-by: Daniel Nelson <daniel@sigpwr.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
  (untested)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Daniel Nelson 2013-01-27 15:38:56 +00:00 committed by Peter Korsgaard
parent 08d9ac9fe7
commit 6b340425e8
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
package/python3/python3-3.3-012-old-stdlib-cache.patch Normal file
View File

@ -0,0 +1,63 @@
python3: Fix pyc-only related runtime exceptions
Python3 changes the pyc lookup strategy, ignoring the
__pycache__ directory if the .py file is missing. Change
install location to enable use of .pyc without their parent .py
See http://www.python.org/dev/peps/pep-3147
Signed-off-by: Daniel Nelson <daniel@sigpwr.com>
--- python3-3.3.0/configure.ac 2013-01-27 16:35:52.429067797 -0800
+++ python3-3.3.0/configure.ac 2013-01-27 16:43:43.528601443 -0800
@@ -1827,6 +1827,23 @@
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
esac
+STDLIB_CACHE_FLAGS=
+AC_MSG_CHECKING(for --enable-old-stdlib-cache)
+AC_ARG_ENABLE(old-stdlib-cache,
+ AS_HELP_STRING([--enable-old-stdlib-cache], [enable pre-pep3147 stdlib cache]),
+[
+ if test "$enableval" = "yes"
+ then
+ STDLIB_CACHE_FLAGS="-b"
+ else
+ STDLIB_CACHE_FLAGS=""
+ fi
+],
+[
+ STDLIB_CACHE_FLAGS=""
+])
+AC_SUBST(STDLIB_CACHE_FLAGS)
+
AC_MSG_CHECKING(for --enable-framework)
if test "$enable_framework"
then
--- python3-3.3.0/Makefile.pre.in 2013-01-27 16:35:52.422067642 -0800
+++ python3-3.3.0/Makefile.pre.in 2013-01-27 16:37:03.710650439 -0800
@@ -143,6 +143,9 @@
# Options to enable prebinding (for fast startup prior to Mac OS X 10.3)
OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@
+# Option to enable old-style precompiled stdlib
+STDLIB_CACHE_FLAGS=@STDLIB_CACHE_FLAGS@
+
# Environment to run shared python without installed libraries
RUNSHARED= @RUNSHARED@
@@ -1079,12 +1082,12 @@
fi
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
+ -d $(LIBDEST) -f $(STDLIB_CACHE_FLAGS) \
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
$(DESTDIR)$(LIBDEST)
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST)/site-packages -f \
+ -d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt

4
package/python3/python3.mk
View File

@ -70,6 +70,10 @@ else
PYTHON3_CONF_OPT += --with-expat=none
endif
ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y)
PYTHON3_CONF_OPT += --enable-old-stdlib-cache
endif
ifeq ($(BR2_PACKAGE_PYTHON3_SQLITE),y)
PYTHON3_DEPENDENCIES += sqlite
endif