diff options
| author | Gregory Lee <lee218@llnl.gov> | 2021-03-24 12:36:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 19:36:30 +0000 |
| commit | 8c3d929d23bf8d562282ca7dfdcb1e44bc6ff5d2 (patch) | |
| tree | 0c5481b3bd4e448f12e2a4f17a6ce95aba02b63f | |
| parent | 1803070d3d95c697bf7a17c2c8f75b16a5ede85f (diff) | |
| download | spack-8c3d929d23bf8d562282ca7dfdcb1e44bc6ff5d2.tar.gz spack-8c3d929d23bf8d562282ca7dfdcb1e44bc6ff5d2.tar.bz2 spack-8c3d929d23bf8d562282ca7dfdcb1e44bc6ff5d2.tar.xz spack-8c3d929d23bf8d562282ca7dfdcb1e44bc6ff5d2.zip | |
fix issue #18853 build of gdk-pixbuf (#22517)
* fix issue #22228 build of gdk-pixbuf
* Update var/spack/repos/builtin/packages/gdk-pixbuf/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/gdk-pixbuf/package.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py index 9a101f90e8..25827c9795 100644 --- a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py +++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py @@ -25,6 +25,8 @@ class GdkPixbuf(Package): version('2.31.2', sha256='9e467ed09894c802499fb2399cd9a89ed21c81700ce8f27f970a833efb1e47aa', deprecated=True) variant('x11', default=False, description="Enable X11 support") + # Man page creation was getting docbook errors, see issue #18853 + variant('man', default=False, description="Enable man page creation") depends_on('meson@0.55.3:', type='build', when='@2.42.2:') depends_on('meson@0.46.0:', type='build', when='@2.37.92:') @@ -34,8 +36,8 @@ class GdkPixbuf(Package): depends_on('shared-mime-info', type='build', when='@2.36.8: platform=cray') depends_on('pkgconfig', type='build') # Building the man pages requires libxslt and the Docbook stylesheets - depends_on('libxslt', type='build') - depends_on('docbook-xsl', type='build') + depends_on('libxslt', type='build', when='+man') + depends_on('docbook-xsl@1.79.2:', type='build', when='+man') depends_on('gettext') depends_on('glib@2.38.0:') depends_on('jpeg') @@ -47,7 +49,7 @@ class GdkPixbuf(Package): # Replace the docbook stylesheet URL with the one that our # docbook-xsl package uses/recognizes. - patch('docbook-cdn.patch') + patch('docbook-cdn.patch', when='+man') def url_for_version(self, version): url = "https://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/{0}/gdk-pixbuf-{1}.tar.xz" @@ -70,7 +72,10 @@ class GdkPixbuf(Package): def install(self, spec, prefix): with working_dir('spack-build', create=True): meson_args = std_meson_args - meson_args += ['-Dx11={0}'.format('+x11' in spec)] + meson_args += [ + '-Dx11={0}'.format('+x11' in spec), + '-Dman={0}'.format('+man' in spec), + ] meson('..', *meson_args) ninja('-v') if self.run_tests: |