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.
This commit is contained in:
Michael Kuhn 2021-02-11 05:46:52 +01:00 committed by GitHub
parent 48af2ac8f9
commit fc00944900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions

View file

@ -26,6 +26,7 @@ class Mesa(MesonPackage):
depends_on('pkgconfig', type='build') depends_on('pkgconfig', type='build')
depends_on('binutils', when=(sys.platform != 'darwin'), type='build') depends_on('binutils', when=(sys.platform != 'darwin'), type='build')
depends_on('bison', type='build') depends_on('bison', type='build')
depends_on('cmake', type='build')
depends_on('flex', type='build') depends_on('flex', type='build')
depends_on('gettext', type='build') depends_on('gettext', type='build')
depends_on('python@3:', type='build') depends_on('python@3:', type='build')

View file

@ -35,7 +35,6 @@ class Meson(PythonPackage):
depends_on('python@3.5:', type=('build', 'run')) depends_on('python@3.5:', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run'))
depends_on('ninja', type='run') depends_on('ninja', type='run')
depends_on('cmake', type='run')
# By default, Meson strips the rpath on installation. This patch disables # By default, Meson strips the rpath on installation. This patch disables
# rpath modification completely to make sure that Spack's rpath changes # rpath modification completely to make sure that Spack's rpath changes