Skip to content

Commit 8c8b74d

Browse files
author
Erlend E. Aasland
committed
bpo-45847: Port _tkinter to PY_STDLIB_MOD
1 parent 0aee55a commit 8c8b74d

File tree

6 files changed

+252
-383
lines changed

6 files changed

+252
-383
lines changed

Makefile.pre.in

-6
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,6 @@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
302302
BUILD_GNU_TYPE= @build@
303303
HOST_GNU_TYPE= @host@
304304

305-
# Tcl and Tk config info from --with-tcltk-includes and -libs options
306-
TCLTK_INCLUDES= @TCLTK_INCLUDES@
307-
TCLTK_LIBS= @TCLTK_LIBS@
308-
309305
# The task to run while instrumented when building the profile-opt target.
310306
# To speed up profile generation, we don't run the full unit test suite
311307
# 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
737733
*) quiet="";; \
738734
esac; \
739735
echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
740-
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
741736
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
742737
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
743-
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
744738
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
745739

746740

Modules/Setup.stdlib.in

+2
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@
156156
# Linux: -luuid, BSD/AIX: libc's uuid_create()
157157
@MODULE__UUID_TRUE@_uuid _uuidmodule.c
158158

159+
@MODULE__TKINTER_TRUE@_tkinter _tkinter.c tkappinit.c
160+
159161
############################################################################
160162
# macOS specific modules
161163

Modules/_tkinter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Copyright (C) 1994 Steen Lumholt.
5555
#include "tkinter.h"
5656

5757
#if TK_HEX_VERSION < 0x08040200
58-
#error "Tk older than 8.4 not supported"
58+
#error "Tk older than 8.4.2 not supported"
5959
#endif
6060

6161
#if TK_HEX_VERSION >= 0x08050208 && TK_HEX_VERSION < 0x08060000 || \

configure

+188-40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)