summaryrefslogtreecommitdiffstats
path: root/package/python/python-2.7-110-optional-db.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-02-13 21:48:53 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-02-14 21:41:43 +0100
commit7e960dc9da56d4a484b5480746aaf617ca491274 (patch)
tree214a78615dbc3700847ca2be645ad75b5235d7ba /package/python/python-2.7-110-optional-db.patch
parent577e52ac087a1a3c63837d0da37c93949c455941 (diff)
downloadbuildroot-7e960dc9da56d4a484b5480746aaf617ca491274.tar.gz
buildroot-7e960dc9da56d4a484b5480746aaf617ca491274.zip
python: bump to 2.7.6
Even though jumping from 2.7.3 to 2.7.6 looks like a minor version bump, it is in fact a fairly significant one, because a good number of changes to help cross-compilation have been merged into Python upstream. Therefore, most of our patches are affected by this change. In detail, this commit: * Renames all the patches to follow the naming convention of patches in Buildroot: the patch file names should not have any version number. * The patches numbered above 100, that add configuration options to disable certain modules of the Python standard library, are only renamed and slightly adapted, they didn't change that much. * The patches numbered below 100 are almost entirely rewritten: many of the cross-compilation problems that used to exist in Python 2.7.3 no longer exist, and the number of remaining problems is smaller, and can be fixed with smaller patches. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python/python-2.7-110-optional-db.patch')
-rw-r--r--package/python/python-2.7-110-optional-db.patch83
1 files changed, 0 insertions, 83 deletions
diff --git a/package/python/python-2.7-110-optional-db.patch b/package/python/python-2.7-110-optional-db.patch
deleted file mode 100644
index b32eea970f..0000000000
--- a/package/python/python-2.7-110-optional-db.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Add an option to disable bsddb
-
-bsddb has an external dependency on Berkeley DB. Since we want to be
-able to build Python without it, this patch adds an option to disable
-the build/installation of this Python module.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
- Makefile.pre.in | 10 ++++++++--
- configure.in | 22 ++++++++++++++++++++++
- 2 files changed, 30 insertions(+), 2 deletions(-)
-
-Index: Python-2.7.2/Makefile.pre.in
-===================================================================
---- Python-2.7.2.orig/Makefile.pre.in
-+++ Python-2.7.2/Makefile.pre.in
-@@ -861,7 +861,7 @@
- email email/mime \
- json \
- sqlite3 \
-- logging bsddb csv importlib wsgiref \
-+ logging csv importlib wsgiref \
- ctypes ctypes/macholib idlelib idlelib/Icons \
- distutils distutils/command \
- multiprocessing multiprocessing/dummy \
-@@ -873,7 +873,7 @@
- LIBSUBDIRS += test test/data \
- test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
- test/tracedmodules email/test email/test/data \
-- json/tests bsddb/test \
-+ json/tests \
- ctypes/test distutils/tests unittest/test
- endif
-
-@@ -914,6 +914,13 @@
- LIBSUBDIRS += $(XMLLIBSUBDIRS)
- endif
-
-+ifeq (@BSDDB@,yes)
-+LIBSUBDIRS += bsddb
-+ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS += bsddb/test
-+endif
-+endif
-+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
-Index: Python-2.7.2/configure.in
-===================================================================
---- Python-2.7.2.orig/configure.in
-+++ Python-2.7.2/configure.in
-@@ -2436,6 +2436,28 @@
- DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
- fi])
-
-+AC_ARG_ENABLE(dbm,
-+ AS_HELP_STRING([--disable-dbm], [disable DBM]),
-+ [ if test "$enableval" = "no"; then
-+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} dbm"
-+ fi])
-+
-+AC_ARG_ENABLE(gdbm,
-+ AS_HELP_STRING([--disable-gdbm], [disable GDBM]),
-+ [ if test "$enableval" = "no"; then
-+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} gdbm"
-+ fi])
-+
-+AC_SUBST(BSDDB)
-+AC_ARG_ENABLE(bsddb,
-+ AS_HELP_STRING([--disable-bsddb], [disable BerkeyleyDB]),
-+ [ if test "$enableval" = "no"; then
-+ BSDDB=no
-+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bsddb"
-+ else
-+ BSDDB=yes
-+ fi], [ BSDDB=yes ])
-+
- AC_ARG_ENABLE(unicodedata,
- AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
- [ if test "$enableval" = "no"; then
OpenPOWER on IntegriCloud