From c24c874810054cb0185807fe797d92056207bbbe Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 28 Dec 2014 21:54:53 +0100 Subject: python3: rename patches to the new convention Note that we don't use completely sequential numbers, because patches below 100 are used to address cross-compilation issues in Python 3, while patches above 100 are used to make more Python 3 modules configurable. [Thomas: fixup commit log.] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" --- package/python3/python3-104-optional-tk.patch | 66 --------------------------- 1 file changed, 66 deletions(-) delete mode 100644 package/python3/python3-104-optional-tk.patch (limited to 'package/python3/python3-104-optional-tk.patch') diff --git a/package/python3/python3-104-optional-tk.patch b/package/python3/python3-104-optional-tk.patch deleted file mode 100644 index 7d672042d5..0000000000 --- a/package/python3/python3-104-optional-tk.patch +++ /dev/null @@ -1,66 +0,0 @@ -Add an option to disable the tk module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin - ---- - Makefile.pre.in | 14 +++++++++++--- - configure.ac | 9 +++++++++ - 2 files changed, 20 insertions(+), 3 deletions(-) - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1139,7 +1139,7 @@ - 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 \ -@@ -1157,8 +1157,7 @@ - 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 \ -@@ -1212,6 +1211,12 @@ - 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 -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2681,6 +2681,15 @@ - 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, -- cgit v1.2.3