linux: build tcl/tk

I'm not yet sure we're building it properly, as we're not yet hooking
this package up to the Python build.

Author: indygreg

cpython-linux/Makefile

@@ -92,7 +92,7 @@ $(OUTDIR)/readline-$(READLINE_VERSION)-%.tar: $(PYTHON_DEP_DEPENDS) $(OUTDIR)/nc
 $(OUTDIR)/sqlite-$(SQLITE_VERSION)-$(PLATFORM).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-sqlite.sh
 	$(BUILD) --platform $(PLATFORM) sqlite
 
-$(OUTDIR)/tcltk-$(TCL_VERSION)-$(PLATFORM).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-tcltk.sh
+$(OUTDIR)/tcl-$(TCL_VERSION)-$(PLATFORM).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-tcltk.sh
 	$(BUILD) --platform $(PLATFORM) tcltk
 
 $(OUTDIR)/uuid-$(UUID_VERSION)-$(PLATFORM).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-uuid.sh
@@ -113,6 +113,7 @@ PYTHON_DEPENDS := \
     $(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)/uuid-$(UUID_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/xz-$(XZ_VERSION)-$(PLATFORM).tar \
     $(OUTDIR)/zlib-$(ZLIB_VERSION)-$(PLATFORM).tar \

cpython-linux/build-tcltk.sh

@@ -10,26 +10,15 @@ cd /build
 export PATH=/tools/${TOOLCHAIN}/bin:/tools/host/bin:$PATH
 
 tar -xf tcl8.6.9-src.tar.gz
-
 pushd tcl8.6.9/unix
-./configure --prefix=/tools/deps
+./configure --prefix=/tools/deps --enable-shared=no
 make -j `nproc`
 make -j `nproc` install DESTDIR=/build/out
 make -j `nproc` install
 popd
 
-tar -xf libX11-1.5.0.tar.gz
-pushd libX11-1.5.0
-./configure --prefix=/tools/deps
-make -j `nproc`
-make -j `nproc` install DEST=/build/out
-make -j `nproc` install
-popd
-
 tar -xf tk8.6.9.1-src.tar.gz
 pushd tk8.6.9/unix
-
-./configure --prefix=/tools/deps --with-tcl=/tools/deps/lib
-
+./configure --prefix=/tools/deps --with-tcl=/tools/deps/lib --enable-shared=no
 make -j `nproc`
 make -j `nproc` install DESTDIR=/build/out

cpython-linux/build.Dockerfile

@@ -2,6 +2,7 @@
 RUN apt-get install \
     file \
     libc6-dev \
+    libx11-dev \
     make \
     patch \
     perl \

cpython-linux/build.py

@@ -448,26 +448,26 @@ def build_readline(client, image, platform, musl=False):
 def build_tcltk(client, image, platform, musl=False):
     tcl_archive = download_entry('tcl', BUILD)
     tk_archive = download_entry('tk', BUILD)
-    x11_archive = download_entry('libx11', BUILD)
 
     with run_container(client, image) as container:
         copy_toolchain(container, musl=musl)
 
         copy_file_to_container(tcl_archive, container, '/build')
         copy_file_to_container(tk_archive, container, '/build')
-        copy_file_to_container(x11_archive, container, '/build')
         copy_file_to_container(SUPPORT / 'build-tcltk.sh', container,
                                '/build')
 
         env = {
+            'CC': 'clang',
             'TOOLCHAIN': 'clang-%s' % platform,
         }
 
         container_exec(container, '/build/build-tcltk.sh',
                        environment=env)
 
         download_tools_archive(container,
-                               archive_path('tcl', platform, musl=musl))
+                               archive_path('tcl', platform, musl=musl),
+                               'deps')
 
 
 def python_build_info(container, config_c_in, setup_dist, setup_local, libressl=False):

pythonbuild/downloads.py

@@ -158,12 +158,6 @@
         'licenses': ['OpenSSL'],
         'license_file': 'LICENSE.libressl.txt',
     },
-    'libx11': {
-        'url': 'https://www.x.org/releases/X11R7.7/src/lib/libX11-1.5.0.tar.gz',
-        'size': 3073820,
-        'sha256': '2ddc05170baf70dd650ee6108c5882eb657cafaf61a5b5261badb26703122518',
-        'version': '1.5.0',
-    },
     'lld': {
         'url': 'http://releases.llvm.org/8.0.0/lld-8.0.0.src.tar.xz',
         'size': 999864,