Commit8c8b74d

Erlend E. Aasland

committed

bpo-45847: Port _tkinter to PY_STDLIB_MOD

1 parent0aee55a commit8c8b74dCopy full SHA for 8c8b74d

File tree

+252

-383

lines changed

+252

-383

lines changed

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -302,10 +302,6 @@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@`
`302`	`302`	`BUILD_GNU_TYPE=@build@`
`303`	`303`	`HOST_GNU_TYPE=@host@`
`304`	`304`
`305`		`-# Tcl and Tk config info from --with-tcltk-includes and -libs options`
`306`		`-TCLTK_INCLUDES=@TCLTK_INCLUDES@`
`307`		`-TCLTK_LIBS=@TCLTK_LIBS@`
`308`		`-`
`309`	`305`	`# The task to run while instrumented when building the profile-opt target.`
`310`	`306`	`# To speed up profile generation, we don't run the full unit test suite`
`311`	`307`	`# 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`
`737`	`733`	`*) quiet="";; \`
`738`	`734`	`esac; \`
`739`	`735`	`echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \`
`740`		`-_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \`
`741`	`736`	`$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \`
`742`	`737`	`$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \`
`743`		`-_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \`
`744`	`738`	`$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build`
`745`	`739`
`746`	`740`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,8 @@`
`156`	`156`	`# Linux: -luuid, BSD/AIX: libc's uuid_create()`
`157`	`157`	`@MODULE__UUID_TRUE@_uuid _uuidmodule.c`
`158`	`158`
	`159`	`+@MODULE__TKINTER_TRUE@_tkinter _tkinter.c tkappinit.c`
	`160`	`+`
`159`	`161`	`############################################################################`
`160`	`162`	`# macOS specific modules`
`161`	`163`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ Copyright (C) 1994 Steen Lumholt.`
`55`	`55`	`#include"tkinter.h"`
`56`	`56`
`57`	`57`	`#ifTK_HEX_VERSION<0x08040200`
`58`		`-#error "Tk older than 8.4 not supported"`
	`58`	`+#error "Tk older than 8.4.2 not supported"`
`59`	`59`	`#endif`
`60`	`60`
`61`	`61`	`#ifTK_HEX_VERSION >=0x08050208&&TK_HEX_VERSION<0x08060000\|\| \`

Lines changed: 188 additions & 40 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Comments

(0)