summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-05-02 09:41:51 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-05-02 09:41:51 -0700
commit999dda8f83f13c985547c33b4634e626edf1919b (patch)
tree17d376d5a17c36e4745fc84ae9968714ed9d7ae2 /var
parent568800c045b788ef5089883ffa3df18660ed8f1f (diff)
parent17fa1b5007355e0c0453b2f6d0213f81586b1756 (diff)
downloadspack-999dda8f83f13c985547c33b4634e626edf1919b.tar.gz
spack-999dda8f83f13c985547c33b4634e626edf1919b.tar.bz2
spack-999dda8f83f13c985547c33b4634e626edf1919b.tar.xz
spack-999dda8f83f13c985547c33b4634e626edf1919b.zip
Merge pull request #708 from adamjstewart/fixes/qt
Prevent use of system GTK+
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 93688fb777..1e1d6302f3 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -101,7 +101,7 @@ class Qt(Package):
@property
def common_config_args(self):
- return [
+ config_args = [
'-prefix', self.prefix,
'-v',
'-opensource',
@@ -115,7 +115,16 @@ class Qt(Package):
'-no-openvg',
'-no-pch',
# NIS is deprecated in more recent glibc
- '-no-nis']
+ '-no-nis'
+ ]
+
+ if '+gtk' in self.spec:
+ config_args.append('-gtkstyle')
+ else:
+ config_args.append('-no-gtkstyle')
+
+ return config_args
+
# Don't disable all the database drivers, but should
# really get them into spack at some point.
@@ -128,8 +137,7 @@ class Qt(Package):
'-thread',
'-shared',
'-release',
- '-fast'
- )
+ '-fast')
@when('@4')
def configure(self):