diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-01-25 16:24:46 +0100 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-01-25 16:24:46 +0100 |
commit | 0eef30440e9597b2c0b9c7a0340a3986a7ea2a65 (patch) | |
tree | f8e74a929418c8085bc09dd5606a10e356923c74 /package/python/python-2.7-104-optional-tk.patch | |
parent | 4c6a451ac9fab16abcda5834ed4a9b728091ab9e (diff) | |
parent | 6ea3c8bd4dabe2b11a8beecb6a641336e6e90f3c (diff) | |
download | buildroot-novena-0eef30440e9597b2c0b9c7a0340a3986a7ea2a65.tar.gz buildroot-novena-0eef30440e9597b2c0b9c7a0340a3986a7ea2a65.zip |
Merge branch 'for-2011.02/python-bump' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/python/python-2.7-104-optional-tk.patch')
-rw-r--r-- | package/python/python-2.7-104-optional-tk.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/package/python/python-2.7-104-optional-tk.patch b/package/python/python-2.7-104-optional-tk.patch new file mode 100644 index 000000000..6bcdcb868 --- /dev/null +++ b/package/python/python-2.7-104-optional-tk.patch @@ -0,0 +1,68 @@ +Add an option to disable the tk module + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +--- + Makefile.pre.in | 14 ++++++++++---- + configure.in | 9 +++++++++ + 2 files changed, 19 insertions(+), 4 deletions(-) + +Index: Python-2.7.1/Makefile.pre.in +=================================================================== +--- Python-2.7.1.orig/Makefile.pre.in ++++ Python-2.7.1/Makefile.pre.in +@@ -851,8 +851,7 @@ + plat-mac/lib-scriptpackages/SystemEvents \ + plat-mac/lib-scriptpackages/Terminal + PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages +-LIBSUBDIRS= lib-tk \ +- site-packages \ ++LIBSUBDIRS= site-packages \ + encodings compiler hotshot \ + email email/mime \ + json \ +@@ -865,8 +864,7 @@ + curses $(MACHDEPS) + + ifeq (@TEST_MODULES@,yes) +-LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ +- lib-tk/test/test_ttk test test/data \ ++LIBSUBDIRS += test test/data \ + test/decimaltestdata test/xmltestdata \ + test/tracedmodules \ + email/test email/test/data \ +@@ -896,6 +894,14 @@ + endif + endif + ++ifeq (@TK@,yes) ++LIBSUBDIRS += lib-tk ++ifeq (@TEST_MODULES@,yes) ++LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ ++ lib-tk/test/test_ttk ++endif ++endif ++ + libinstall: build_all $(srcdir)/Lib/$(PLATDIR) + @for i in $(SCRIPTDIR) $(LIBDEST); \ + do \ +Index: Python-2.7.1/configure.in +=================================================================== +--- Python-2.7.1.orig/configure.in ++++ Python-2.7.1/configure.in +@@ -2401,6 +2401,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, |