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

qt: fix qt@4+gui on darwin (#22602)

Browse Source
This commit is contained in:
Seth R. Johnson 2021-03-28 09:34:50 -04:00 committed by GitHub
parent 666240cdf8
commit 579d97117d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,9 +408,6 @@ def use_spack_dep(spack_pkg, qt_name=None):
use_spack_dep('freetype') use_spack_dep('freetype')
if not MACOS_VERSION: if not MACOS_VERSION:
config_args.append('-fontconfig') config_args.append('-fontconfig')
elif version < Version('5.15'):
# Linux-only QT5 dependencies
config_args.append('-system-xcb')
else: else:
config_args.append('-no-freetype') config_args.append('-no-freetype')
config_args.append('-no-gui') config_args.append('-no-gui')
@ -552,6 +549,9 @@ def configure(self, spec, prefix):
]) ])
if version < Version('5.12'): if version < Version('5.12'):
config_args.append('-no-xinput2') config_args.append('-no-xinput2')
elif version < Version('5.15') and '+gui' in spec:
# Linux-only QT5 dependencies
config_args.append('-system-xcb')
if '~webkit' in spec: if '~webkit' in spec:
config_args.extend([ config_args.extend([