Skip to content

Conversation

@jjhelmus
Copy link
Contributor

@jjhelmus jjhelmus commented Jan 8, 2026

These files are needed for _tkinter. They were mistakenly removed in #928.

These files are needed for _tkinter. They were mistakenly removed in
 astral-sh#928.
@jjhelmus jjhelmus added platform:darwin Specific to the macOS platform platform:linux Specific to the Linux platform labels Jan 8, 2026
@jjhelmus
Copy link
Contributor Author

jjhelmus commented Jan 8, 2026

The diff from the commit prior to #928 makes the overall change clear:

❯ git diff de54d2de355998491763f49bd9348d66b2ba6fe9 cpython-unix/build-cpython.sh
...
@@ -1268,11 +1282,11 @@ fi
 # And prune libraries we never reference.
 rm -f ${ROOT}/out/python/build/lib/{libdb-6.0,libxcb-*,libX11-xcb}.a

-if [ -d "${TOOLS_PATH}/deps/lib/tcl8" ]; then
+if [ -d "${TOOLS_PATH}/deps/lib/tcl9" ]; then
     # Copy tcl/tk resources needed by tkinter.
     mkdir ${ROOT}/out/python/install/lib/tcl
     # Keep this list in sync with tcl_library_paths.
-    for source in ${TOOLS_PATH}/deps/lib/{itcl4.2.4,tcl8,tcl8.6,thread2.8.9,tk8.6}; do
+    for source in ${TOOLS_PATH}/deps/lib/{itcl4.3.5,tcl9,tcl9.0,thread3.0.4,tk9.0}; do
         cp -av $source ${ROOT}/out/python/install/lib/
     done

Copy link

@EliteTK EliteTK left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have not ran. But I can confirm that at least on the bash level it doesn't do anything since de54d2d that isn't just changing tcl8 references to tcl9 references. I can also confirm it doesn't appear to introduce any new bash-level issues.

But why are we so inconsistent on quoting?

@jjhelmus
Copy link
Contributor Author

jjhelmus commented Jan 8, 2026

But why are we so inconsistent on quoting?

The quoting is inconsistent in most of the build scripts. I think it evolved that way, likely from various copying from various sources. Running all of scripts through shellcheck, fixing the issues and adding that as a pre-commit/CI check is a good idea.

@EliteTK
Copy link

EliteTK commented Jan 8, 2026

Running all of scripts through shellcheck, fixing the issues and adding that as a pre-commit/CI check is a good idea.

Decrustifying old shell scripts is something i enjoy (believe it or not), might look at it at some point. Thanks for confirming that it would be a welcome change :)

@jjhelmus jjhelmus merged commit 877d0fb into astral-sh:main Jan 8, 2026
961 of 963 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

platform:darwin Specific to the macOS platform platform:linux Specific to the Linux platform

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants