diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2021-12-06 07:08:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-06 14:08:22 +0100 |
| commit | 9b1b38d2de3d0bef5a37c1d8712fe89cdf29ddfd (patch) | |
| tree | 5f874ad01b8306c796f4dc86d054a6a5ca50d5ef | |
| parent | 2bb075c850a6b0efcb3ecdc5de130deb2107322c (diff) | |
| download | spack-9b1b38d2de3d0bef5a37c1d8712fe89cdf29ddfd.tar.gz spack-9b1b38d2de3d0bef5a37c1d8712fe89cdf29ddfd.tar.bz2 spack-9b1b38d2de3d0bef5a37c1d8712fe89cdf29ddfd.tar.xz spack-9b1b38d2de3d0bef5a37c1d8712fe89cdf29ddfd.zip | |
librsvg,libcroco: add doc variant to avoid unsolvable constraints due to gtkplus (#27790)
* [libcroco] add variant doc, depends_on gtk-doc when +doc
* [librsvg] add variant doc, depends_on gtk-doc when +doc
| -rw-r--r-- | var/spack/repos/builtin/packages/libcroco/package.py | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/librsvg/package.py | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/libcroco/package.py b/var/spack/repos/builtin/packages/libcroco/package.py index 788ae665e2..586bbce4b2 100644 --- a/var/spack/repos/builtin/packages/libcroco/package.py +++ b/var/spack/repos/builtin/packages/libcroco/package.py @@ -15,12 +15,18 @@ class Libcroco(AutotoolsPackage): version('0.6.13', sha256='767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4') version('0.6.12', sha256='ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860') + variant('doc', default=False, description='Build documentation with gtk-doc') + depends_on('glib') depends_on('libxml2') - depends_on('gtk-doc', type='build') + depends_on('gtk-doc', type='build', when='+doc') depends_on('pkgconfig', type='build') def configure_args(self): + args = [ + '--enable-gtk-doc=' + ('yes' if self.spec.variants['doc'].value else 'no') + ] # macOS ld does not support this flag # https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/libcroco.rb - return ['--disable-Bsymbolic'] + args.append('--disable-Bsymbolic') + return args diff --git a/var/spack/repos/builtin/packages/librsvg/package.py b/var/spack/repos/builtin/packages/librsvg/package.py index 7351e56cb3..39d5bb871e 100644 --- a/var/spack/repos/builtin/packages/librsvg/package.py +++ b/var/spack/repos/builtin/packages/librsvg/package.py @@ -17,10 +17,12 @@ class Librsvg(AutotoolsPackage): version('2.50.0', sha256='b3fadba240f09b9c9898ab20cb7311467243e607cf8f928b7c5f842474ee3df4') version('2.44.14', sha256='6a85a7868639cdd4aa064245cc8e9d864dad8b8e9a4a8031bb09a4796bc4e303') + variant('doc', default=False, description='Build documentation with gtk-doc') + depends_on("gobject-introspection", type='build') depends_on("pkgconfig", type='build') depends_on("rust", type='build') - depends_on('gtk-doc', type='build') + depends_on('gtk-doc', type='build', when='+doc') depends_on("cairo+gobject") depends_on("gdk-pixbuf") depends_on("glib") @@ -48,3 +50,8 @@ class Librsvg(AutotoolsPackage): def setup_run_environment(self, env): env.prepend_path('XDG_DATA_DIRS', self.prefix.share) + + def configure_args(self): + return [ + '--enable-gtk-doc=' + ('yes' if self.spec.variants['doc'].value else 'no') + ] |