summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/python/package.py3
-rw-r--r--var/spack/repos/builtin/packages/python/tkinter-3.8.patch12
2 files changed, 15 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py
index cd55b6629e..496350f557 100644
--- a/var/spack/repos/builtin/packages/python/package.py
+++ b/var/spack/repos/builtin/packages/python/package.py
@@ -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')
diff --git a/var/spack/repos/builtin/packages/python/tkinter-3.8.patch b/var/spack/repos/builtin/packages/python/tkinter-3.8.patch
new file mode 100644
index 0000000000..a1fc5729aa
--- /dev/null
+++ b/var/spack/repos/builtin/packages/python/tkinter-3.8.patch
@@ -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