summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2016-08-25 10:41:16 -0400
committerBen Boeckel <ben.boeckel@kitware.com>2016-09-06 16:00:20 -0400
commit5ba1144515985889c72eb87fff9e98ec02fb865e (patch)
tree461b7edf976b0b98ac0c492aa62da1c05ab5d1a8
parent4b471ecc6e9b48e2083194d88023d9638fdf5f2d (diff)
downloadspack-5ba1144515985889c72eb87fff9e98ec02fb865e.tar.gz
spack-5ba1144515985889c72eb87fff9e98ec02fb865e.tar.bz2
spack-5ba1144515985889c72eb87fff9e98ec02fb865e.tar.xz
spack-5ba1144515985889c72eb87fff9e98ec02fb865e.zip
qt: create a dbus variant
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 1a664e1287..8136208184 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -47,6 +47,7 @@ class Qt(Package):
variant('krellpatch', default=False, description="Build with openspeedshop based patch.")
variant('mesa', default=False, description="Depend on mesa.")
variant('gtk', default=False, description="Build with gtkplus.")
+ variant('dbus', default=False, description="Build with D-Bus support.")
patch('qt3krell.patch', when='@3.3.8b+krellpatch')
@@ -61,7 +62,7 @@ class Qt(Package):
depends_on("gtkplus", when='+gtk')
depends_on("libxml2")
depends_on("zlib")
- depends_on("dbus", when='@4:')
+ depends_on("dbus", when='@4:+dbus')
depends_on("libtiff")
depends_on("libpng@1.2.56", when='@3')
depends_on("libpng", when='@4:')
@@ -145,7 +146,7 @@ class Qt(Package):
@property
def common_config_args(self):
- return [
+ config_args = [
'-prefix', self.prefix,
'-v',
'-opensource',
@@ -154,7 +155,6 @@ class Qt(Package):
'-shared',
'-confirm-license',
'-openssl-linked',
- '-dbus-linked',
'-optimized-qmake',
'-no-openvg',
'-no-pch',
@@ -162,6 +162,13 @@ class Qt(Package):
'-no-nis'
]
+ if '+dbus' in self.spec:
+ config_args.append('-dbus-linked')
+ else:
+ config_args.append('-no-dbus')
+
+ return config_args
+
# Don't disable all the database drivers, but should
# really get them into spack at some point.