From fc00944900feadde23ed0fa99420e4b2d9b9ccd9 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 11 Feb 2021 05:46:52 +0100 Subject: meson: remove cmake dependency (#21607) cmake was added as a runtime dependency to meson in #20449. This introduces an unnecessary implicit cmake dependency, which increases build time for meson considerably. cmake is only one of many methods for finding dependencies (pkg-config, qmake etc.), which are also not runtime dependencies of meson. Add cmake as a build dependency to mesa instead. --- var/spack/repos/builtin/packages/mesa/package.py | 1 + var/spack/repos/builtin/packages/meson/package.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index aa7aa18384..c377872f79 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -26,6 +26,7 @@ class Mesa(MesonPackage): depends_on('pkgconfig', type='build') depends_on('binutils', when=(sys.platform != 'darwin'), type='build') depends_on('bison', type='build') + depends_on('cmake', type='build') depends_on('flex', type='build') depends_on('gettext', type='build') depends_on('python@3:', type='build') diff --git a/var/spack/repos/builtin/packages/meson/package.py b/var/spack/repos/builtin/packages/meson/package.py index c2315f77f4..1d5662e0cd 100644 --- a/var/spack/repos/builtin/packages/meson/package.py +++ b/var/spack/repos/builtin/packages/meson/package.py @@ -35,7 +35,6 @@ class Meson(PythonPackage): depends_on('python@3.5:', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) depends_on('ninja', type='run') - depends_on('cmake', type='run') # By default, Meson strips the rpath on installation. This patch disables # rpath modification completely to make sure that Spack's rpath changes -- cgit v1.2.3-60-g2f50