From 0932b16d4ef905508630d5c11d3719b3b08d1b2a Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Wed, 24 May 2017 07:43:22 +1000 Subject: cairo: ensure that X support is disabled for variant "~X" (#4242) * cairo: ensure that X support is disabled for variant "~X" * cairo: explicitly enable X support for +X variant * cairo: prefer "variant in spec" over spec.satisfies(variant) --- var/spack/repos/builtin/packages/cairo/package.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index 5d04bf29fa..a7e0d150b8 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -51,4 +51,8 @@ class Cairo(AutotoolsPackage): def configure_args(self): args = ["--disable-trace", # can cause problems with libiberty "--enable-tee"] + if '+X' in self.spec: + args.extend(["--enable-xlib", "--enable-xcb"]) + else: + args.extend(["--disable-xlib", "--disable-xcb"]) return args -- cgit v1.2.3-70-g09d2