From 8c59736ff954d8501bb8adeb38ced5e5a588b5df Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Tue, 15 Mar 2022 17:38:57 +0100 Subject: libdrm: add docs variants and missing dependency (#29423) --- var/spack/repos/builtin/packages/libdrm/package.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py index 9ded666787..8d94031fbb 100644 --- a/var/spack/repos/builtin/packages/libdrm/package.py +++ b/var/spack/repos/builtin/packages/libdrm/package.py @@ -27,13 +27,26 @@ class Libdrm(Package): version('2.4.59', sha256='ed9d03a92c2d80e6310cc350db3430620f1659ae084a07c6824cee7bc81ae8fa') version('2.4.33', sha256='bd2a8fecf28616f2157ca33ede691c139cc294ed2d0c4244b62ca7d22e98e5a4') + variant('docs', default=False, description="Build man pages") + depends_on('pkgconfig', type='build') - depends_on('docbook-xml', type='build') - depends_on('docbook-xsl', type='build') depends_on('libpciaccess@0.10:') depends_on('libpthread-stubs') + + # 2.4.90 is the first version to use meson, spack defaults to meson since + # 2.4.101. depends_on('meson', type='build', when='@2.4.101:') + # >= 2.4.104 uses reStructuredText for man pages. + with when('@2.4.104: +docs'): + depends_on('py-docutils', type='build') + + # < 2.4.104 uses docbook for man pages. + with when('@:2.4.103 +docs'): + depends_on('docbook-xml', type='build') + depends_on('docbook-xsl', type='build') + depends_on('libxslt', type='build') + def url_for_version(self, version): if version <= Version('2.4.100'): return self.list_url + 'libdrm-%s.tar.gz' % version @@ -41,8 +54,9 @@ class Libdrm(Package): return self.list_url + 'libdrm-%s.tar.xz' % version def meson_args(self): - args = [] - return args + return [ + '-Dman-pages=' + ('true' if '+docs' in self.spec else 'false') + ] def install(self, spec, prefix): with working_dir('spack-build', create=True): -- cgit v1.2.3-60-g2f50