summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorSeth R. Johnson <johnsonsr@ornl.gov>2021-03-28 09:34:50 -0400
committerGitHub <noreply@github.com>2021-03-28 08:34:50 -0500
commit579d97117d3e486c33d72d2f9db6f6f13792f416 (patch)
treebe9d6a4151142e101dadb60b8a4bf772366fab80 /var
parent666240cdf894cf3eb81b8667b9f31a2cd760a1a7 (diff)
downloadspack-579d97117d3e486c33d72d2f9db6f6f13792f416.tar.gz
spack-579d97117d3e486c33d72d2f9db6f6f13792f416.tar.bz2
spack-579d97117d3e486c33d72d2f9db6f6f13792f416.tar.xz
spack-579d97117d3e486c33d72d2f9db6f6f13792f416.zip
qt: fix qt@4+gui on darwin (#22602)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 170c28f739..ab6adee3ca 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -408,9 +408,6 @@ class Qt(Package):
use_spack_dep('freetype')
if not MACOS_VERSION:
config_args.append('-fontconfig')
- elif version < Version('5.15'):
- # Linux-only QT5 dependencies
- config_args.append('-system-xcb')
else:
config_args.append('-no-freetype')
config_args.append('-no-gui')
@@ -552,6 +549,9 @@ class Qt(Package):
])
if version < Version('5.12'):
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:
config_args.extend([