summaryrefslogtreecommitdiffstats
path: root/package/python/python-2.7-104-optional-tk.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/python/python-2.7-104-optional-tk.patch')
-rw-r--r--package/python/python-2.7-104-optional-tk.patch35
1 files changed, 17 insertions, 18 deletions
diff --git a/package/python/python-2.7-104-optional-tk.patch b/package/python/python-2.7-104-optional-tk.patch
index 6bcdcb868..12f123616 100644
--- a/package/python/python-2.7-104-optional-tk.patch
+++ b/package/python/python-2.7-104-optional-tk.patch
@@ -7,31 +7,30 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 9 +++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -851,8 +851,7 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -856,7 +856,7 @@
plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
--LIBSUBDIRS= lib-tk \
-- site-packages \
+-LIBSUBDIRS= lib-tk site-packages \
+LIBSUBDIRS= site-packages \
encodings compiler hotshot \
email email/mime \
json \
-@@ -865,8 +864,7 @@
+@@ -870,8 +870,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 @@
+-LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
+- lib-tk/test/test_ttk test test/data \
++LIBSUBDIRS += test test/data \
+ test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ test/tracedmodules email/test email/test/data \
+ json/tests sqlite3/test bsddb/test \
+@@ -899,6 +898,14 @@
endif
endif
@@ -46,11 +45,11 @@ Index: Python-2.7.1/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2401,6 +2401,15 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2416,6 +2416,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi