diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pyqt/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 3 |
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: |