diff options
author | Erlend Egeberg Aasland <erlend.aasland@innova.no> | 2022-03-31 10:19:08 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-31 10:19:08 (GMT) |
commit | b36d222110d0d6d84dc8e973ca87d976c2423f5d (patch) | |
tree | 400ef6d69aad09d5e95ad89b64f56c60959bf175 /Doc | |
parent | 7fc39a21cb85163a456eab91b52e5fe85e7f7e3e (diff) | |
download | cpython-b36d222110d0d6d84dc8e973ca87d976c2423f5d.zip cpython-b36d222110d0d6d84dc8e973ca87d976c2423f5d.tar.gz cpython-b36d222110d0d6d84dc8e973ca87d976c2423f5d.tar.bz2 |
bpo-45847: Port _tkinter to PY_STDLIB_MOD (GH-31698)
- Remove ``--with-tclk-*`` options from `configure`
- Use pkg-config to detect `_tkinter` dependencies (Tcl/Tk, X11)
- Manual override via environment variables `TCLTK_CFLAGS` and `TCLTK_LIBS`
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/using/configure.rst | 8 | ||||
-rw-r--r-- | Doc/whatsnew/3.10.rst | 4 | ||||
-rw-r--r-- | Doc/whatsnew/3.11.rst | 10 | ||||
-rw-r--r-- | Doc/whatsnew/3.9.rst | 2 |
4 files changed, 11 insertions, 13 deletions
diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index f1c156c..debbee7 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -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). diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst index 905305b..dd01c88 100644 --- a/Doc/whatsnew/3.10.rst +++ b/Doc/whatsnew/3.10.rst @@ -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 diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst index 837d8c8..129e87e 100644 --- a/Doc/whatsnew/3.11.rst +++ b/Doc/whatsnew/3.11.rst @@ -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. diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst index c7255b3..6dee55e 100644 --- a/Doc/whatsnew/3.9.rst +++ b/Doc/whatsnew/3.9.rst @@ -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. |