summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Lee <lee218@llnl.gov>2016-11-23 15:10:12 -0700
committerbecker33 <becker33@llnl.gov>2016-11-23 14:10:12 -0800
commit96bc3ff8f69347cab797dc32c14adcbcb30676da (patch)
tree58c388569eda812c423d48ba04303192cd7b295f
parenta6db0bfae2663951dca1f4e51cb631f332a6f430 (diff)
downloadspack-96bc3ff8f69347cab797dc32c14adcbcb30676da.tar.gz
spack-96bc3ff8f69347cab797dc32c14adcbcb30676da.tar.bz2
spack-96bc3ff8f69347cab797dc32c14adcbcb30676da.tar.xz
spack-96bc3ff8f69347cab797dc32c14adcbcb30676da.zip
added qt variants for pyqt to build (#2389)
-rw-r--r--var/spack/repos/builtin/packages/py-pyqt/package.py2
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-pyqt/package.py b/var/spack/repos/builtin/packages/py-pyqt/package.py
index de68bfaa90..43f2e2630b 100644
--- a/var/spack/repos/builtin/packages/py-pyqt/package.py
+++ b/var/spack/repos/builtin/packages/py-pyqt/package.py
@@ -39,7 +39,7 @@ class PyPyqt(Package):
# TODO: allow qt5 when conditional deps are supported.
# TODO: Fix version matching so that @4 works like @:4
- depends_on('qt@:4')
+ depends_on('qt@:4+phonon+dbus')
def install(self, spec, prefix):
python('configure.py',
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 6447d7d6d4..1db651c02b 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -51,6 +51,7 @@ class Qt(Package):
variant('webkit', default=False, description="Build the Webkit extension")
variant('examples', default=False, description="Build examples.")
variant('dbus', default=False, description="Build with D-Bus support.")
+ variant('phonon', default=False, description="Build with phonon support.")
patch('qt3krell.patch', when='@3.3.8b+krellpatch')
@@ -179,7 +180,7 @@ class Qt(Package):
if '~examples' in self.spec:
config_args.extend(['-nomake', 'examples'])
- if '@4' in self.spec:
+ if '@4' in self.spec and '~phonon' in self.spec:
config_args.append('-no-phonon')
if '+dbus' in self.spec: