diff options
author | John W. Parent <45471568+johnwparent@users.noreply.github.com> | 2023-01-12 20:31:58 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-12 17:31:58 -0800 |
commit | 92b7f633650c4e9167d54c500685f8aece1e54e1 (patch) | |
tree | f06ce9651fe93783e8eb5a9642b2b597b09cbfb7 /var | |
parent | a1930e36e79161b857bbb71a0e693599a3c48725 (diff) | |
download | spack-92b7f633650c4e9167d54c500685f8aece1e54e1.tar.gz spack-92b7f633650c4e9167d54c500685f8aece1e54e1.tar.bz2 spack-92b7f633650c4e9167d54c500685f8aece1e54e1.tar.xz spack-92b7f633650c4e9167d54c500685f8aece1e54e1.zip |
Ninja package: resolve circular dependency (#34887)
#33128 Introduces a dependency on re2c into the Ninja build recipe.
This is problematic on Windows as we use CMake to build re2c, and
Ninja to drive the CMake build. This PR resolves this issue by
adding a variant to toggle the use of re2c with ninja.
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/ninja/package.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index b666a02a2d..018455c79b 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -35,8 +35,12 @@ class Ninja(Package): version("1.7.2", sha256="2edda0a5421ace3cf428309211270772dd35a91af60c96f93f90df6bc41b16d9") version("1.6.0", sha256="b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7") + variant( + "re2c", default=not sys.platform == "win32", description="Enable buidling Ninja with re2c" + ) + depends_on("python", type="build") - depends_on("re2c@0.11.3:", type="build") + depends_on("re2c@0.11.3:", type="build", when="+re2c") phases = ["configure", "install"] |