diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2016-08-30 10:52:11 -0400 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2016-09-06 16:01:16 -0400 |
| commit | 112122bc28bea05e960691f4ee87acd53d15d509 (patch) | |
| tree | d191570751105f0b2d680791bfe7f7e380fdbbe3 /var | |
| parent | fca26c0b7916142471a2dda53ac1448a912eedda (diff) | |
| download | spack-112122bc28bea05e960691f4ee87acd53d15d509.tar.gz spack-112122bc28bea05e960691f4ee87acd53d15d509.tar.bz2 spack-112122bc28bea05e960691f4ee87acd53d15d509.tar.xz spack-112122bc28bea05e960691f4ee87acd53d15d509.zip | |
qt: progress on qt5.5 on osx
Qt5.5 searches for the SDK itself and just ignores environment variables
like CC and CXX, skipping the spack wrappers.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 5fdd07c7a5..3217b90215 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -173,7 +173,16 @@ class Qt(Package): else: config_args.append('-no-dbus') - if sys.platform == 'darwin': + if '@5:' in self.spec and sys.platform == 'darwin': + config_args.extend([ + '-no-xinput2', + '-no-xcb-xlib', + '-no-pulseaudio', + '-no-alsa', + '-no-gtkstyle', + ]) + + if '@4' in self.spec and sys.platform == 'darwin': sdkpath = which('xcrun')('--show-sdk-path', # XXX(macos): the 10.11 SDK fails to configure. '--sdk', 'macosx10.9', @@ -222,7 +231,6 @@ class Qt(Package): def configure(self): configure('-no-eglfs', '-no-directfb', - '-qt-xcb', '{0}-gtkstyle'.format('' if '+gtk' in self.spec else '-no'), '-skip', 'qtwebkit', *self.common_config_args) |