unix: build tcl/tk on macOS

Previously, we used the system tcl/tk, which is version 8.5. Unfortunately
as reported by #43, this lacks some features. And the official CPython macOS
dmg compiles its own tcl/tk at version 8.6, so our packages weren't on parity
with the official ones.

This commit enables the building of tcl/tk from sources on macOS. This was
surprisingly straightforward. The big changes are to ditch the system
frameworks and replace with our own libraries.

I confirmed that `import tkinter` works and that our new binaries do not link
against any tcl/tk libraries or frameworks. I also successfully ran a minimal
visual application with tkinter. I'm fairly confident this "just works."

Closes #43.

Author: indygreg

cpython-unix/Makefile

@@ -57,7 +57,7 @@ ifeq ($(HOST_PLATFORM),macos)
     NEED_GDBM :=
     NEED_X11 :=
     NEED_READLINE :=
-    NEED_TIX :=
+    NEED_TIX := 1
 endif
 
 ifdef PYBUILD_MUSL

cpython-unix/build-cpython.sh

@@ -209,8 +209,6 @@ CFLAGS="-fPIC -I${TOOLS_PATH}/deps/include -I${TOOLS_PATH}/deps/include/ncurses"
 
 if [ "${PYBUILD_PLATFORM}" = "macos" ]; then
     CFLAGS="${CFLAGS} -I${TOOLS_PATH}/deps/lib/libffi-3.2.1/include -I${TOOLS_PATH}/deps/include/uuid"
-
-    CFLAGS="${CFLAGS} -I${MACOS_SDK_PATH}/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers"
     CFLAGS="${CFLAGS} -F${MACOS_SDK_PATH}/System/Library/Frameworks"
 
     # Prevent using symbols not supported by current macOS SDK target.
@@ -477,13 +475,11 @@ cp -av ${TOOLS_PATH}/deps/libedit/lib/*.a ${ROOT}/out/python/build/lib/
 rm -f ${ROOT}/out/python/build/lib/{libdb-6.0,libxcb-*,libX11-xcb}.a
 
 # Copy tcl/tk/tix resources needed by tkinter.
-if [ "${PYBUILD_PLATFORM}" != "macos" ]; then
-  mkdir ${ROOT}/out/python/install/lib/tcl
-  # Keep this list in sync with tcl_library_paths.
-  for source in ${TOOLS_PATH}/deps/lib/{tcl8,tcl8.6,thread2.8.5,Tix8.4.3,tk8.6}; do
+mkdir ${ROOT}/out/python/install/lib/tcl
+# Keep this list in sync with tcl_library_paths.
+for source in ${TOOLS_PATH}/deps/lib/{tcl8,tcl8.6,thread2.8.5,Tix8.4.3,tk8.6}; do
     cp -av $source ${ROOT}/out/python/install/lib/
-  done
-fi
+done
 
 # config.c defines _PyImport_Inittab and extern references to modules, which
 # downstream consumers may want to strip. We bundle config.c and config.c.in so

cpython-unix/build.py

@@ -638,6 +638,9 @@ def build_cpython(
             "libedit",
             "libffi",
             "sqlite",
+            "tcl",
+            "tix",
+            "tk",
             "uuid",
             "xz",
             "zlib",
@@ -660,10 +663,6 @@ def build_cpython(
         if host_platform == "linux64":
             packages |= {"libX11", "libXau", "libxcb", "xorgproto"}
 
-        tix = host_platform != "macos"
-        if tix:
-            packages |= {"tcl", "tix", "tk"}
-
         for p in sorted(packages):
             build_env.install_artifact_archive(BUILD, p, target_triple, optimizations)
 
@@ -773,16 +772,14 @@ def build_cpython(
             "license_path": "licenses/LICENSE.cpython.txt",
         }
 
-        # We do not ship tcl libraries on macOS.
-        if host_platform != "macos":
-            python_info["tcl_library_path"] = "install/lib"
-            python_info["tcl_library_paths"] = [
-                "tcl8",
-                "tcl8.6",
-                "thread2.8.5",
-                "Tix8.4.3",
-                "tk8.6",
-            ]
+        python_info["tcl_library_path"] = "install/lib"
+        python_info["tcl_library_paths"] = [
+            "tcl8",
+            "tcl8.6",
+            "thread2.8.5",
+            "Tix8.4.3",
+            "tk8.6",
+        ]
 
         # Add metadata derived from built distribution.
         extra_metadata = build_env.get_file("metadata.json")

cpython-unix/static-modules.3.7.macos

@@ -23,7 +23,7 @@ _queue _queuemodule.c
 _scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
 _sqlite3 _sqlite/cache.c _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c -IModules/_sqlite -DMODULE_NAME=\"sqlite3\" -DSQLITE_OMIT_LOAD_EXTENSION=1 -lsqlite3
 _ssl _ssl.c -lssl -lcrypto
-_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -framework AppKit -framework ApplicationServices -framework Carbon -framework CoreServices -framework CoreGraphics -framework IOKit -framework Tcl -framework Tk
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -framework AppKit -framework ApplicationServices -framework Carbon -framework CoreServices -framework CoreGraphics -framework IOKit -ltcl8.6 -ltk8.6
 _uuid _uuidmodule.c -luuid
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
 readline readline.c -ledit -lncurses

cpython-unix/static-modules.3.8.macos

@@ -24,7 +24,7 @@ _queue _queuemodule.c
 _scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
 _sqlite3 _sqlite/cache.c _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c -IModules/_sqlite -DMODULE_NAME=\"sqlite3\" -DSQLITE_OMIT_LOAD_EXTENSION=1 -lsqlite3
 _ssl _ssl.c -lssl -lcrypto
-_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -framework AppKit -framework ApplicationServices -framework Carbon -framework CoreServices -framework CoreGraphics -framework IOKit -framework Tcl -framework Tk
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -framework AppKit -framework ApplicationServices -framework Carbon -framework CoreServices -framework CoreGraphics -framework IOKit -ltcl8.6 -ltk8.6
 _uuid _uuidmodule.c -luuid
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
 readline readline.c -ledit -lncurses