From 112122bc28bea05e960691f4ee87acd53d15d509 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 30 Aug 2016 10:52:11 -0400 Subject: 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. --- var/spack/repos/builtin/packages/qt/package.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'var') 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) -- cgit v1.2.3-60-g2f50