bpo-45847: Port _tkinter to PY_STDLIB_MOD

python · Mar 6, 2022 · 8c8b74d · 8c8b74d
1 parent 0aee55a
commit 8c8b74d
Show file tree

Hide file tree

Showing 6 changed files with 252 additions and 383 deletions.
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -302,10 +302,6 @@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
 BUILD_GNU_TYPE=	@build@
 HOST_GNU_TYPE=	@host@
 
-# Tcl and Tk config info from --with-tcltk-includes and -libs options
-TCLTK_INCLUDES=	@TCLTK_INCLUDES@
-TCLTK_LIBS=	@TCLTK_LIBS@
-
 # The task to run while instrumented when building the profile-opt target.
 # To speed up profile generation, we don't run the full unit test suite
 # by default. The default is "-m test --pgo". To run more tests, use
@@ -737,10 +733,8 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt @LIBMPDEC_INTERNAL@ @LIBEXPAT_INTERNAL
 	    *) quiet="";; \
 	esac; \
 	echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
 
 

diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
@@ -156,6 +156,8 @@
 # Linux: -luuid, BSD/AIX: libc's uuid_create()
 @MODULE__UUID_TRUE@_uuid _uuidmodule.c
 
+@MODULE__TKINTER_TRUE@_tkinter _tkinter.c tkappinit.c
+
 ############################################################################
 # macOS specific modules
 

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -55,7 +55,7 @@ Copyright (C) 1994 Steen Lumholt.
 #include "tkinter.h"
 
 #if TK_HEX_VERSION < 0x08040200
-#error "Tk older than 8.4 not supported"
+#error "Tk older than 8.4.2 not supported"
 #endif
 
 #if TK_HEX_VERSION >= 0x08050208 && TK_HEX_VERSION < 0x08060000 || \

diff --git a/configure b/configure