|
@@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
|
index badb2af35d..931cc3ed07 100644
|
|
|
--- a/Makefile.pre.in
|
|
|
+++ b/Makefile.pre.in
|
|
|
-@@ -1168,7 +1168,9 @@ ifeq (@PYDOC@,yes)
|
|
|
+@@ -1225,7 +1225,9 @@ ifeq (@PYDOC@,yes)
|
|
|
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
|
|
|
endif
|
|
|
-rm -f $(DESTDIR)$(BINDIR)/2to3
|
|
@@ -30,7 +30,7 @@ index badb2af35d..931cc3ed07 100644
|
|
|
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
|
|
|
(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
|
|
|
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
|
|
|
-@@ -1205,7 +1207,6 @@ LIBSUBDIRS= tkinter site-packages \
|
|
|
+@@ -1262,7 +1264,6 @@ LIBSUBDIRS= tkinter site-packages \
|
|
|
html json http dbm xmlrpc \
|
|
|
sqlite3 \
|
|
|
logging csv wsgiref urllib \
|
|
@@ -38,7 +38,7 @@ index badb2af35d..931cc3ed07 100644
|
|
|
ctypes ctypes/macholib \
|
|
|
idlelib idlelib/Icons \
|
|
|
distutils distutils/command $(XMLLIBSUBDIRS) \
|
|
|
-@@ -1255,9 +1256,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
|
|
+@@ -1332,9 +1333,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
|
|
test/test_email test/test_email/data \
|
|
|
test/test_json \
|
|
|
sqlite3/test \
|
|
@@ -48,7 +48,7 @@ index badb2af35d..931cc3ed07 100644
|
|
|
ctypes/test \
|
|
|
idlelib/idle_test \
|
|
|
distutils/tests \
|
|
|
-@@ -1267,6 +1265,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
|
|
+@@ -1342,6 +1340,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
|
|
test/test_tools test/test_warnings test/test_warnings/data \
|
|
|
unittest/test unittest/test/testmock
|
|
|
|
|
@@ -63,7 +63,7 @@ index badb2af35d..931cc3ed07 100644
|
|
|
ifeq (@TEST_MODULES@,yes)
|
|
|
LIBSUBDIRS += $(TESTSUBDIRS)
|
|
|
endif
|
|
|
-@@ -1366,10 +1372,12 @@ ifeq (@PYC_BUILD@,yes)
|
|
|
+@@ -1441,10 +1447,12 @@ ifeq (@PYC_BUILD@,yes)
|
|
|
-d $(LIBDEST)/site-packages -f \
|
|
|
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
|
|
endif
|
|
@@ -75,12 +75,12 @@ index badb2af35d..931cc3ed07 100644
|
|
|
+endif
|
|
|
|
|
|
python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
|
|
- # Substitution happens here, as the completely-expanded BINDIR
|
|
|
+ @ # Substitution happens here, as the completely-expanded BINDIR
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
index 1621fa1611..13b2edf8b7 100644
|
|
|
--- a/configure.ac
|
|
|
+++ b/configure.ac
|
|
|
-@@ -3124,6 +3124,12 @@ AC_ARG_ENABLE(test-modules,
|
|
|
+@@ -3174,6 +3174,12 @@ AC_ARG_ENABLE(test-modules,
|
|
|
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
|
|
|
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
|
|
|
|
|
@@ -97,7 +97,7 @@ diff --git a/setup.py b/setup.py
|
|
|
index 94dd337fef..76429e1326 100644
|
|
|
--- a/setup.py
|
|
|
+++ b/setup.py
|
|
|
-@@ -2282,10 +2282,11 @@ def main():
|
|
|
+@@ -2333,10 +2333,11 @@ def main():
|
|
|
import warnings
|
|
|
warnings.filterwarnings("ignore",category=DeprecationWarning)
|
|
|
|