summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilton Woods <miltonjwoods@gmail.com>2017-05-24 07:43:22 +1000
committerAdam J. Stewart <ajstewart426@gmail.com>2017-05-23 16:43:22 -0500
commit0932b16d4ef905508630d5c11d3719b3b08d1b2a (patch)
tree46b0df50ede989a84f555cb704a2cba2c0927b0b
parentd0a81fda3056d988acc3d783501c49733944113d (diff)
downloadspack-0932b16d4ef905508630d5c11d3719b3b08d1b2a.tar.gz
spack-0932b16d4ef905508630d5c11d3719b3b08d1b2a.tar.bz2
spack-0932b16d4ef905508630d5c11d3719b3b08d1b2a.tar.xz
spack-0932b16d4ef905508630d5c11d3719b3b08d1b2a.zip
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)
-rw-r--r--var/spack/repos/builtin/packages/cairo/package.py4
1 files changed, 4 insertions, 0 deletions
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