summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorJohn W. Parent <45471568+johnwparent@users.noreply.github.com>2024-03-14 21:08:38 -0400
committerGitHub <noreply@github.com>2024-03-14 19:08:38 -0600
commit4495e0341d37da0545ff86c58c66219fde00f65d (patch)
treebf7b74e9bd500094da5ad46147609dca0f6c24e9 /var
parentba3992404656a77414215643bd6631d863329d35 (diff)
downloadspack-4495e0341d37da0545ff86c58c66219fde00f65d.tar.gz
spack-4495e0341d37da0545ff86c58c66219fde00f65d.tar.bz2
spack-4495e0341d37da0545ff86c58c66219fde00f65d.tar.xz
spack-4495e0341d37da0545ff86c58c66219fde00f65d.zip
Clingo bootstrapping: Remove msvc constraint (#43199)
Patch allowing Clingo to build with VS22 has landed both in Spack and Clingo upstream, update Spack's bootstrap constraints to handle this. Additionally, properly scope the patch application in the clingo package to handle upstream patch.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/clingo/package.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/clingo/package.py b/var/spack/repos/builtin/packages/clingo/package.py
index 65fa2c56c8..8ef318b81d 100644
--- a/var/spack/repos/builtin/packages/clingo/package.py
+++ b/var/spack/repos/builtin/packages/clingo/package.py
@@ -75,7 +75,7 @@ class Clingo(CMakePackage):
patch("python38.patch", when="@5.3:5.4.0")
patch("size-t.patch", when="%msvc")
patch("vs2022.patch", when="%msvc@19.30:")
- patch("clingo_msc_1938_native_handle.patch", when="%msvc@19.38:")
+ patch("clingo_msc_1938_native_handle.patch", when="@:5.7.0 %msvc@19.38:")
# TODO: Simplify this after Spack 0.21 release. The old concretizer has problems with
# py-setuptools ^python@3.6, so we only apply the distutils -> setuptools patch for Python 3.12