linux: build _tkinter extension

The last commit did the heavy lifting of getting tcl/tk
built from source.

This commit puts the final touches on things so we can enable the
_tkinter extension module. We had to tweak the tcl/tk build
settings a bit. We also defined missing license annotations
for those packages.

With this commit `import tkinter` works from a standalone
executable! Although there may be some paths leaking into
the binary creating problems for compatibility on different
distros. But at least we're past the milestone of building
the extension!

Author: indygreg

LICENSE.tcl.txt

@@ -0,0 +1,40 @@
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
+Corporation and other parties.  The following terms apply to all files
+associated with the software unless explicitly disclaimed in
+individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7014 (b) (3) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.

cpython-linux/Makefile

@@ -171,12 +171,16 @@ PYTHON_DEPENDS := \
     $(OUTDIR)/gdbm-$(GDBM_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/libedit-$(LIBEDIT_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/libffi-$(LIBFFI_VERSION)-$(PLATFORM).tar \
+    $(OUTDIR)/libX11-$(LIBX11_VERSION)-$(PLATFORM).tar \
+    $(OUTDIR)/libXau-$(LIBXAU_VERSION)-$(PLATFORM).tar \
+    $(OUTDIR)/libxcb-$(LIBXCB_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/ncurses-$(NCURSES_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/readline-$(READLINE_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/sqlite-$(SQLITE_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/tcl-$(TCL_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/tk-$(TK_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/uuid-$(UUID_VERSION)-$(PLATFORM).tar \
+    $(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/xz-$(XZ_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/zlib-$(ZLIB_VERSION)-$(PLATFORM).tar \
     $(HERE)/static-modules \

cpython-linux/build-tcl.sh

@@ -13,6 +13,8 @@ export PKG_CONFIG_PATH=/tools/deps/share/pkgconfig:/tools/deps/lib/pkgconfig
 tar -xf tcl8.6.9-src.tar.gz
 pushd tcl8.6.9/unix
 CFLAGS="-fPIC -I/tools/deps/include" ./configure \
-    --prefix=/tools/deps
+    --prefix=/tools/deps \
+    --enable-shared=no
+
 make -j `nproc`
 make -j `nproc` install DESTDIR=/build/out

cpython-linux/build-tk.sh

@@ -19,5 +19,6 @@ CFLAGS="-fPIC" ./configure \
     --x-libraries=/tools/deps/lib \
     --with-tcl=/tools/deps/lib \
     --enable-shared=no
+
 make -j `nproc`
 make -j `nproc` install DESTDIR=/build/out

cpython-linux/build.py

@@ -666,8 +666,7 @@ def build_cpython(client, image, platform, debug=False, optimized=False, musl=Fa
 
     setup = derive_setup_local(static_modules_lines, python_archive,
                                python_version=entry['version'],
-                               musl=musl, debug=debug,
-                               disabled={b'_tkinter'})
+                               musl=musl, debug=debug)
 
     config_c_in = parse_config_c(setup['config_c_in'].decode('utf-8'))
     setup_dist_content = setup['setup_dist']
@@ -686,6 +685,9 @@ def build_cpython(client, image, platform, debug=False, optimized=False, musl=Fa
         install_tools_archive(container, archive_path('bzip2', platform, musl=musl))
         install_tools_archive(container, archive_path('libedit', platform, musl=musl))
         install_tools_archive(container, archive_path('libffi', platform, musl=musl))
+        install_tools_archive(container, archive_path('libX11', platform, musl=musl))
+        install_tools_archive(container, archive_path('libXau', platform, musl=musl))
+        install_tools_archive(container, archive_path('libxcb', platform, musl=musl))
         install_tools_archive(container, archive_path('ncurses', platform, musl=musl))
 
         if libressl:
@@ -698,6 +700,7 @@ def build_cpython(client, image, platform, debug=False, optimized=False, musl=Fa
         install_tools_archive(container, archive_path('tcl', platform, musl=musl))
         install_tools_archive(container, archive_path('tk', platform, musl=musl))
         install_tools_archive(container, archive_path('uuid', platform, musl=musl))
+        install_tools_archive(container, archive_path('xorgproto', platform, musl=musl))
         install_tools_archive(container, archive_path('xz', platform, musl=musl))
         install_tools_archive(container, archive_path('zlib', platform, musl=musl))
         #copy_rust(container)

cpython-linux/static-modules

@@ -28,7 +28,7 @@ _ssl _ssl.c -I/tools/deps/include -lssl -lcrypto
 _testbuffer _testbuffer.c
 _testimportmultiple _testimportmultiple.c
 _testmultiphase _testmultiphase.c
-_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I/tools/deps/include -I/usr/include/X11 -L/tools/deps/lib -ltcl8.6 -ltk8.6 -lX11
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I/tools/deps/include/X11 -L/tools/deps/lib -ltcl8.6 -ltk8.6 -lX11 -lxcb -lXau
 _uuid _uuidmodule.c -I/tools/deps/include/uuid -luuid
 _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 ossaudiodev ossaudiodev.c

pythonbuild/downloads.py

@@ -330,12 +330,18 @@
         'size': 10000896,
         'sha256': 'ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e',
         'version': '8.6.9',
+        'library_names': ['tcl8.6'],
+        'licenses': ['TCL'],
+        'license_file': 'LICENSE.tcl.txt',
     },
     'tk': {
         'url': 'https://prdownloads.sourceforge.net/tcl/tk8.6.9.1-src.tar.gz',
         'size': 4364603,
         'sha256': '8fcbcd958a8fd727e279f4cac00971eee2ce271dc741650b1fc33375fb74ebb4',
         'version': '8.6.9.1',
+        'library_names': ['tk8.6'],
+        'licenses': ['TCL'],
+        'license_file': 'LICENSE.tcl.txt',
     },
     'tk-windows-bin': {
         'url': 'https://github.com/python/cpython-bin-deps/archive/86027ce3edda1284ae4bf6c2c580288366af4052.tar.gz',