From dd67868ef66fb72c937e9e9a0bbf00a193918643 Mon Sep 17 00:00:00 2001 From: iarspider Date: Tue, 10 Dec 2019 18:58:37 +0100 Subject: More variants for cairo (#14092) --- var/spack/repos/builtin/packages/cairo/package.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index c752122e50..6cc9779ad0 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -21,18 +21,26 @@ class Cairo(AutotoolsPackage): variant('X', default=False, description="Build with X11 support") variant('pdf', default=False, description="Enable cairo's PDF surface backend feature") variant('gobject', default=False, description="Enable cairo's gobject functions feature") + variant('ft', default=False, description="Enable cairo's FreeType font backend feature") + variant('fc', default=False, description="Enable cairo's Fontconfig font backend feature") + variant('png', default=False, description="Enable cairo's PNG functions feature") + variant('svg', default=False, description="Enable cairo's SVN functions feature") depends_on('libx11', when='+X') depends_on('libxext', when='+X') depends_on('libxrender', when='+X') depends_on('libxcb', when='+X') depends_on('python', when='+X', type='build') - depends_on('libpng') + depends_on('libpng', when='+png') + depends_on('librsvg', when='+svg') depends_on('glib') depends_on('pixman') - depends_on('freetype') + depends_on('freetype', when='+ft') depends_on('pkgconfig', type='build') - depends_on('fontconfig@2.10.91:') # Require newer version of fontconfig. + depends_on('fontconfig@2.10.91:', when='+fc') # Require newer version of fontconfig. + + conflicts('+png', when='platform=darwin') + conflicts('+svg', when='platform=darwin') def configure_args(self): args = [ @@ -47,5 +55,7 @@ class Cairo(AutotoolsPackage): args.extend(self.enable_or_disable('pdf')) args.extend(self.enable_or_disable('gobject')) + args.extend(self.enable_or_disable('ft')) + args.extend(self.enable_or_disable('fc')) return args -- cgit v1.2.3-70-g09d2