diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-01-04 19:23:28 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-01-05 00:14:15 +0100 |
| commit | 5c63280caf23ca7438e2fe23586cca9f450fc936 (patch) | |
| tree | 0e3bf7672070a5bb06d298b2d01abe61caf0c085 /package/python3/0021-Add-an-option-to-disable-the-tk-module.patch | |
| parent | 6fc5de4ef466b649b37a86e4f4994a667149dd80 (diff) | |
| download | buildroot-5c63280caf23ca7438e2fe23586cca9f450fc936.tar.gz buildroot-5c63280caf23ca7438e2fe23586cca9f450fc936.zip | |
python3: switch to Git formatted patches
In preparation for the bump to Python 3.5.0, let's switch all the
patches to the Git format. This way, a Git repository of the Python
source code can be used to manage those patches, which makes it easier
to bump to newer Python versions.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python3/0021-Add-an-option-to-disable-the-tk-module.patch')
| -rw-r--r-- | package/python3/0021-Add-an-option-to-disable-the-tk-module.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/package/python3/0021-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0021-Add-an-option-to-disable-the-tk-module.patch new file mode 100644 index 0000000000..fc3c9b431c --- /dev/null +++ b/package/python3/0021-Add-an-option-to-disable-the-tk-module.patch @@ -0,0 +1,71 @@ +From 006bf215734ad63007de044fe7803f66f83a4d19 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Wed, 23 Dec 2015 11:49:14 +0100 +Subject: [PATCH] Add an option to disable the tk module + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Samuel Martin <s.martin49@gmail.com> +--- + Makefile.pre.in | 11 ++++++++--- + configure.ac | 9 +++++++++ + 2 files changed, 17 insertions(+), 3 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 433cac1..e492d7b 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1137,7 +1137,7 @@ PLATDIR= plat-$(MACHDEP) + EXTRAPLATDIR= @EXTRAPLATDIR@ + MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR) + XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax +-LIBSUBDIRS= tkinter \ ++LIBSUBDIRS= \ + site-packages \ + asyncio \ + collections concurrent concurrent/futures encodings \ +@@ -1155,8 +1155,7 @@ LIBSUBDIRS= tkinter \ + venv venv/scripts venv/scripts/posix \ + curses $(MACHDEPS) + +-TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ +- test test/test_asyncio \ ++TESTSUBDIRS = test test/test_asyncio \ + test/test_email test/test_email/data \ + test/test_json \ + test/audiodata \ +@@ -1210,6 +1209,12 @@ LIBSUBDIRS += sqlite3 + TESTSUBDIRS += sqlite3/test + endif + ++ifeq (@TK@,yes) ++LIBSUBDIRS += tkinter ++TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ ++ tkinter/test/test_ttk ++endif ++ + ifeq (@TEST_MODULES@,yes) + LIBSUBDIRS += $(TESTSUBDIRS) + endif +diff --git a/configure.ac b/configure.ac +index aaffbd6..7efd54f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2667,6 +2667,15 @@ if test "$SQLITE3" = "no" ; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" + fi + ++AC_SUBST(TK) ++AC_ARG_ENABLE(tk, ++ AS_HELP_STRING([--disable-tk], [disable tk]), ++ [ TK="${enableval}" ], [ TK=yes ]) ++ ++if test "$TK" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" ++fi ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.6.4 + |
