diff options
| -rw-r--r-- | etc/spack/defaults/packages.yaml | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ninja-fortran/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ninja/package.py | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index d3fcbc6b31..7994d49f19 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -36,6 +36,8 @@ packages: mpe: [mpe2] mpi: [openmpi, mpich] mysql-client: [mysql, mariadb-c-client] + ninja: [ninja, ninja-fortran] + ninja-fortran: [ninja-fortran, ninja@kitware] opencl: [pocl] openfoam: [openfoam-com, openfoam-org, foam-extend] pil: [py-pillow] diff --git a/var/spack/repos/builtin/packages/ninja-fortran/package.py b/var/spack/repos/builtin/packages/ninja-fortran/package.py index 605c897a72..e15de14b35 100644 --- a/var/spack/repos/builtin/packages/ninja-fortran/package.py +++ b/var/spack/repos/builtin/packages/ninja-fortran/package.py @@ -25,7 +25,9 @@ class NinjaFortran(Package): version('1.7.2.0.gcc0ea', '3982f508c415c0abaca34cb5e92e711a') version('1.7.1.0.g7ca7f', '187a8d15c1e20e5e9b00c5c3f227ca8a') - depends_on('python', type=('build', 'run')) + depends_on('python', type='build') + + provides('ninja') phases = ['configure', 'install'] diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index 7deb90d345..7be01a6f47 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -22,7 +22,9 @@ class Ninja(Package): version('1.7.2', '7b482218757acbaeac4d4d54a3cd94e1') version('1.6.0', '254133059f2da79d8727f654d7198f43') - depends_on('python', type=('build', 'run')) + depends_on('python', type='build') + + provides('ninja-fortran', when='@kitware') phases = ['configure', 'install'] |