summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoffrey Oxberry <goxberry@gmail.com>2019-06-10 09:53:30 -0700
committerChuck Atkins <chuck.atkins@kitware.com>2019-06-10 12:53:30 -0400
commita52ed34fa4e3a2a2c59749ab603f47bdc733c91d (patch)
tree0e95e462399b5a9eccde4ecbdc3ddb92355c3b53
parentc98190a6ec155a3bff0bd8cd77d41438b2714543 (diff)
downloadspack-a52ed34fa4e3a2a2c59749ab603f47bdc733c91d.tar.gz
spack-a52ed34fa4e3a2a2c59749ab603f47bdc733c91d.tar.bz2
spack-a52ed34fa4e3a2a2c59749ab603f47bdc733c91d.tar.xz
spack-a52ed34fa4e3a2a2c59749ab603f47bdc733c91d.zip
ninja{-fortran}: make pkgs nonvirtual (fix #11628) (#11629)
-rw-r--r--etc/spack/defaults/packages.yaml2
-rw-r--r--var/spack/repos/builtin/packages/ninja-fortran/package.py2
-rw-r--r--var/spack/repos/builtin/packages/ninja/package.py2
3 files changed, 0 insertions, 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):