python: correctly disable ~tkinter when @3.8 (#26365)

The older patch does not apply so the build ends up failing:
```
     1539    In file included from /private/var/folders/fy/x2xtwh1n7fn0_0q2kk29xkv9vvmbqb/T/s3j/spack-stage/spack-stage-python-3.8.11
             -6jyb6sxztfs6fw26xdbc3ktmbtut3ypr/spack-src/Modules/_tkinter.c:48:
  >> 1540    /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/tk.h:86:11: f
             atal error: 'X11/Xlib.h' file not found
     1541    #       include <X11/Xlib.h>
     1542                    ^~~~~~~~~~~~
     1543    1 error generated.
```
This commit is contained in:
Seth R. Johnson 2021-10-04 04:18:23 -04:00 committed by GitHub
parent 7104b8599e
commit 5d431087ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions

View File

@ -199,6 +199,9 @@ class Python(AutotoolsPackage):
patch('python-3.7.4+-distutils-C++-testsuite.patch', when='@3.7.4:')
patch('tkinter.patch', when='@:2.8,3.3:3.7 platform=darwin')
# Patch the setup script to deny that tcl/x11 exists rather than allowing
# autodetection of (possibly broken) system components
patch('tkinter-3.8.patch', when='@3.8: ~tkinter')
# Ensure that distutils chooses correct compiler option for RPATH on cray:
patch('cray-rpath-2.3.patch', when='@2.3:3.0.1 platform=cray')

View File

@ -0,0 +1,12 @@
diff -Naur a/setup.py b/setup.py
--- a/setup.py.orig 2021-09-29 21:28:23.000000000 -0400
+++ a/setup.py 2021-09-29 21:28:44.000000000 -0400
@@ -1826,6 +1826,8 @@
def detect_tkinter(self):
# The _tkinter module.
+ return False
+
# Check whether --with-tcltk-includes and --with-tcltk-libs were
# configured or passed into the make target. If so, use these values
# to build tkinter and bypass the searches for Tcl and TK in standard