Skip to content

bpo-45847: Port _tkinter to PY_STDLIB_MOD #31698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Mar 31, 2022
Merged

bpo-45847: Port _tkinter to PY_STDLIB_MOD #31698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0aee55a
Remove obsolete HAVE_UCS4_TCL check
Nov 26, 2021
8c8b74d
bpo-45847: Port _tkinter to PY_STDLIB_MOD
Nov 27, 2021
da79509
Remove dead lines from Setup.stdlib.in
Mar 6, 2022
1533c54
Update What's New
Mar 6, 2022
a8313a1
Use LIBS iso. LDFLAGS when compiling conftest
Mar 7, 2022
f835d6d
Remove references to --with-tclk-* from Doc
Mar 7, 2022
72cf592
Add special-case for FreeBSD
Mar 7, 2022
ff95879
Merge remote-tracking branch 'upstream/main' into ac-tkinter
Mar 7, 2022
ea426ef
Regen configure bco. GH-31700
Mar 7, 2022
27f2dd1
Merge branch 'main' into ac-tkinter
Mar 7, 2022
5816799
Don't break configure if x11 is not found
Mar 8, 2022
4c435ec
Reduce configure noise
Mar 14, 2022
80615d2
Merge branch 'main' into ac-tkinter
Mar 14, 2022
aa083a5
Fix PKG_CHECK_EXISTS
Mar 14, 2022
789dc24
Remove obsoleted functions from setup.py
Mar 14, 2022
5e9887d
Merge branch 'main' into ac-tkinter
Mar 17, 2022
b8ee798
make patchcheck
Mar 17, 2022
0cf682f
Merge remote-tracking branch main into ac-tkinter
Mar 17, 2022
1574c1b
Merge remote-tracking branch 'upstream/main' into ac-tkinter
Mar 30, 2022
b48d671
Address review: document the removal of the configure options
Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Doc/using/configure.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,14 +404,6 @@ Libraries options

.. versionadded:: 3.10

.. cmdoption:: --with-tcltk-includes='-I...'

Override search for Tcl and Tk include files.

.. cmdoption:: --with-tcltk-libs='-L...'

Override search for Tcl and Tk libraries.

.. cmdoption:: --with-libm=STRING

Override ``libm`` math library to *STRING* (default is system-dependent).
Expand Down
4 changes: 2 additions & 2 deletions Doc/whatsnew/3.10.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2019,8 +2019,8 @@ Build Changes

* The ``configure`` script now uses the ``pkg-config`` utility, if available,
to detect the location of Tcl/Tk headers and libraries. As before, those
locations can be explicitly specified with the :option:`--with-tcltk-includes`
and :option:`--with-tcltk-libs` configuration options.
locations can be explicitly specified with the ``--with-tcltk-includes``
and ``--with-tcltk-libs`` configuration options.
(Contributed by Manolis Stamatogiannakis in :issue:`42603`.)

* Add :option:`--with-openssl-rpath` option to ``configure`` script. The option
Expand Down
10 changes: 8 additions & 2 deletions Doc/whatsnew/3.11.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,11 +770,17 @@ Build Changes

* Build dependencies, compiler flags, and linker flags for most stdlib
extension modules are now detected by :program:`configure`. libffi, libnsl,
libsqlite3, zlib, bzip2, liblzma, libcrypt, and uuid flags are detected by
``pkg-config`` (when available).
libsqlite3, zlib, bzip2, liblzma, libcrypt, Tcl/Tk libs, and uuid flags
are detected by ``pkg-config`` (when available).
(Contributed by Christian Heimes and Erlend Egeberg Aasland in
:issue:`bpo-45847`, :issue:`45747`, and :issue:`45763`.)

.. note::
Use the environment variables ``TCLTK_CFLAGS`` and ``TCLTK_LIBS`` to
manually specify the location of Tcl/Tk headers and libraries.
The :program:`configure` options ``--with-tcltk-includes`` and
``--with-tcltk-libs`` have been removed.

* CPython now has experimental support for cross compiling to WebAssembly
platform ``wasm32-emscripten``. The effort is inspired by previous work
like Pyodide.
Expand Down
2 changes: 1 addition & 1 deletion Doc/whatsnew/3.9.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,7 +1249,7 @@ Build Changes
of macOS. If a macOS SDK is explicitly configured, by using
:option:`--enable-universalsdk` or ``-isysroot``, only the SDK itself is
searched. The default behavior can still be overridden with
:option:`--with-tcltk-includes` and :option:`--with-tcltk-libs`.
``--with-tcltk-includes`` and ``--with-tcltk-libs``.
(Contributed by Ned Deily in :issue:`34956`.)

* Python can now be built for Windows 10 ARM64.
Expand Down
6 changes: 0 additions & 6 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -736,10 +732,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


Expand Down
5 changes: 2 additions & 3 deletions Modules/Setup.stdlib.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,11 @@
# needs -lcrypt
@MODULE__HASHLIB_TRUE@_hashlib _hashopenssl.c

# needs -ltk, -ltcl, and sometimes -lX11
#@MODULE__TKINTER_TRUE@_tkinter _tkinter.c tkappinit.c

# 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

Expand Down
Loading