diff options
| author | John W. Parent <45471568+johnwparent@users.noreply.github.com> | 2024-03-14 21:08:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-14 19:08:38 -0600 |
| commit | 4495e0341d37da0545ff86c58c66219fde00f65d (patch) | |
| tree | bf7b74e9bd500094da5ad46147609dca0f6c24e9 | |
| parent | ba3992404656a77414215643bd6631d863329d35 (diff) | |
| download | spack-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.
| -rw-r--r-- | lib/spack/spack/bootstrap/_common.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/clingo/package.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/spack/spack/bootstrap/_common.py b/lib/spack/spack/bootstrap/_common.py index 08bb9377b7..2ce53d3165 100644 --- a/lib/spack/spack/bootstrap/_common.py +++ b/lib/spack/spack/bootstrap/_common.py @@ -213,9 +213,6 @@ def _root_spec(spec_str: str) -> str: platform = str(spack.platforms.host()) if platform == "darwin": spec_str += " %apple-clang" - elif platform == "windows": - # TODO (johnwparent): Remove version constraint when clingo patch is up - spec_str += " %msvc@:19.37" elif platform == "linux": spec_str += " %gcc" elif platform == "freebsd": 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 |