summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2017-08-04 09:36:02 -0500
committerGitHub <noreply@github.com>2017-08-04 09:36:02 -0500
commit408dfc8e863c00f950d7b084dc92f3b912e03c03 (patch)
treed46f9d764ad701d42a93ea9b119f9288f43a6fb6
parentf8dfb6a4866179629b03b2c8796b69ef18ae45df (diff)
downloadspack-408dfc8e863c00f950d7b084dc92f3b912e03c03.tar.gz
spack-408dfc8e863c00f950d7b084dc92f3b912e03c03.tar.bz2
spack-408dfc8e863c00f950d7b084dc92f3b912e03c03.tar.xz
spack-408dfc8e863c00f950d7b084dc92f3b912e03c03.zip
Qt: disable OpenGL support by default (#4962)
* Qt: disable OpenGL support by default * Fix qt+opengl build
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 89e821b68f..e872a53013 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -53,8 +53,6 @@ class Qt(Package):
# OpenSpeedShop project
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('webkit', default=False,
@@ -65,7 +63,7 @@ class Qt(Package):
description="Build with D-Bus support.")
variant('phonon', default=False,
description="Build with phonon support.")
- variant('opengl', default=True,
+ variant('opengl', default=False,
description="Build with OpenGL support.")
patch('qt3krell.patch', when='@3.3.8b+krellpatch')
@@ -109,7 +107,7 @@ class Qt(Package):
depends_on("python", when='@5.7.0:', type='build')
# OpenGL hardware acceleration
- depends_on("mesa", when='@4:+mesa')
+ depends_on("mesa", when='@4:+opengl')
depends_on("libxcb", when=sys.platform != 'darwin')
depends_on("libx11", when=sys.platform != 'darwin')