summaryrefslogtreecommitdiffstats
path: root/package/python3/python3-103-optional-sqlite.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-02-18 21:40:01 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-02-18 23:22:18 +0100
commit0d327c267a57e3a75b10becde772addb7fc49297 (patch)
tree31a2ffa5ec6c7b3d002fa156d81321b3c1f867cf /package/python3/python3-103-optional-sqlite.patch
parent249778541b68c10156c6687e14888f6047556922 (diff)
downloadbuildroot-0d327c267a57e3a75b10becde772addb7fc49297.tar.gz
buildroot-0d327c267a57e3a75b10becde772addb7fc49297.zip
python3: bump to 3.4.0rc1
This commit bumps the Python3 package to use Python 3.4.0rc1. About the patches: * The patches below 100 are significantly changed, because like for Python 2.x, a good number of improvements have been made in the upstream Python for cross-compilation. Therefore, almost all of these patches have been modified. * All the patches above 100 are simply updated for Python 3.4.0, with a small refactoring for the handling of test modules. The details of the python3.mk changes are: * --without-ensurepip to tell Python to not use PIP at build time. * Many environment variables are no longer passed, they were specific to our cross-compilation patches * The fixup of the LIBDIR in the Python Makefile is no longer needed since Python has switched to _sysconfigdata.py for distutils configuration instead of parsing the Makefile. * A new post patch hooks touches the two files generated by pgen to make sure they are newer than the pgen sources, which ensures pgen is not built/executed. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python3/python3-103-optional-sqlite.patch')
-rw-r--r--package/python3/python3-103-optional-sqlite.patch53
1 files changed, 26 insertions, 27 deletions
diff --git a/package/python3/python3-103-optional-sqlite.patch b/package/python3/python3-103-optional-sqlite.patch
index e3a63c3e02..eb8d242053 100644
--- a/package/python3/python3-103-optional-sqlite.patch
+++ b/package/python3/python3-103-optional-sqlite.patch
@@ -8,12 +8,12 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
configure.ac | 9 +++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
-Index: cpython/configure.ac
+Index: b/configure.ac
===================================================================
---- cpython.orig/configure.ac
-+++ cpython/configure.ac
-@@ -2448,6 +2448,15 @@
- esac])
+--- a/configure.ac
++++ b/configure.ac
+@@ -2666,6 +2666,15 @@
+ AC_CHECK_FUNCS(pthread_atfork)
fi
+AC_SUBST(SQLITE3)
@@ -28,37 +28,36 @@ Index: cpython/configure.ac
AC_SUBST(PYDOC)
AC_ARG_ENABLE(pydoc,
-Index: cpython/Makefile.pre.in
+Index: b/Makefile.pre.in
===================================================================
---- cpython.orig/Makefile.pre.in
-+++ cpython/Makefile.pre.in
-@@ -985,7 +985,6 @@
- collections concurrent concurrent/futures encodings \
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1131,7 +1131,6 @@
email email/mime \
+ ensurepip ensurepip/_bundled \
html json http dbm xmlrpc \
- sqlite3 \
logging csv wsgiref urllib \
- ctypes ctypes/macholib idlelib idlelib/Icons \
- distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1025,7 +1024,6 @@
- test/namespace_pkgs/module_and_namespace_package/a_test \
- test/test_email test/test_email/data \
- test/json_tests \
-- sqlite3/test \
- ctypes/test \
- distutils/tests \
+ ctypes ctypes/macholib \
+ idlelib idlelib/Icons \
+@@ -1173,7 +1172,7 @@
+ test/namespace_pkgs/project3/parent/child \
+ test/namespace_pkgs/module_and_namespace_package \
+ test/namespace_pkgs/module_and_namespace_package/a_test \
+- sqlite3/test idlelib/idle_test \
++ idlelib/idle_test \
test/test_importlib test/test_importlib/builtin \
-@@ -1048,6 +1046,13 @@
- endif
+ test/test_importlib/extension test/test_importlib/frozen \
+ test/test_importlib/import_ test/test_importlib/source \
+@@ -1192,6 +1191,11 @@
+ lib2to3/tests/data/fixers/myfixes
endif
+ifeq (@SQLITE3@,yes)
+LIBSUBDIRS += sqlite3
-+ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS += sqlite3/test
-+endif
++TESTSUBDIRS += sqlite3/test
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
+ ifeq (@TEST_MODULES@,yes)
+ LIBSUBDIRS += $(TESTSUBDIRS)
+ endif
OpenPOWER on IntegriCloud