zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: progress on qt5.5 on osx

Browse Source 
Qt5.5 searches for the SDK itself and just ignores environment variables
like CC and CXX, skipping the spack wrappers.
This commit is contained in:
Ben Boeckel 2016-08-30 10:52:11 -04:00
parent fca26c0b79
commit 112122bc28
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/qt/package.py
View File

@ -173,7 +173,16 @@ def common_config_args(self):
else: else:
config_args.append('-no-dbus') 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', sdkpath = which('xcrun')('--show-sdk-path',
# XXX(macos): the 10.11 SDK fails to configure. # XXX(macos): the 10.11 SDK fails to configure.
'--sdk', 'macosx10.9', '--sdk', 'macosx10.9',
@ -222,7 +231,6 @@ def configure(self):
def configure(self): def configure(self):
configure('-no-eglfs', configure('-no-eglfs',
'-no-directfb', '-no-directfb',
'-qt-xcb',
'{0}-gtkstyle'.format('' if '+gtk' in self.spec else '-no'), '{0}-gtkstyle'.format('' if '+gtk' in self.spec else '-no'),
'-skip', 'qtwebkit', '-skip', 'qtwebkit',
*self.common_config_args) *self.common_config_args)