From a52ed34fa4e3a2a2c59749ab603f47bdc733c91d Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Mon, 10 Jun 2019 09:53:30 -0700 Subject: [PATCH] ninja{-fortran}: make pkgs nonvirtual (fix #11628) (#11629) --- etc/spack/defaults/packages.yaml | 2 -- var/spack/repos/builtin/packages/ninja-fortran/package.py | 2 -- var/spack/repos/builtin/packages/ninja/package.py | 2 -- 3 files changed, 6 deletions(-) diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index c278f7bec7..d2bd57aeb4 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -36,8 +36,6 @@ 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 e15de14b35..022db64fba 100644 --- a/var/spack/repos/builtin/packages/ninja-fortran/package.py +++ b/var/spack/repos/builtin/packages/ninja-fortran/package.py @@ -27,8 +27,6 @@ class NinjaFortran(Package): depends_on('python', type='build') - provides('ninja') - phases = ['configure', 'install'] def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index 7be01a6f47..c7da7c1933 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -24,8 +24,6 @@ class Ninja(Package): depends_on('python', type='build') - provides('ninja-fortran', when='@kitware') - phases = ['configure', 'install'] def configure(self, spec, prefix):