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)
This commit is contained in:
Milton Woods 2017-05-24 07:43:22 +10:00 committed by Adam J. Stewart
parent d0a81fda30
commit 0932b16d4e

View File

@ -51,4 +51,8 @@ class Cairo(AutotoolsPackage):
def configure_args(self): def configure_args(self):
args = ["--disable-trace", # can cause problems with libiberty args = ["--disable-trace", # can cause problems with libiberty
"--enable-tee"] "--enable-tee"]
if '+X' in self.spec:
args.extend(["--enable-xlib", "--enable-xcb"])
else:
args.extend(["--disable-xlib", "--disable-xcb"])
return args return args