summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorEric Brugger <brugger1@llnl.gov>2021-10-14 04:41:26 -0700
committerGitHub <noreply@github.com>2021-10-14 07:41:26 -0400
commit2bc97f62fd27a8e755f21ab91bf56c1e99fa0838 (patch)
tree154f9a8d488a4eb6cabf0a5ef4486eef20fc83eb /var
parent949094544e479439e76581125a70c9c3c23cf997 (diff)
downloadspack-2bc97f62fd27a8e755f21ab91bf56c1e99fa0838.tar.gz
spack-2bc97f62fd27a8e755f21ab91bf56c1e99fa0838.tar.bz2
spack-2bc97f62fd27a8e755f21ab91bf56c1e99fa0838.tar.xz
spack-2bc97f62fd27a8e755f21ab91bf56c1e99fa0838.zip
Qt: Qt fixes for a Cray AMD system. (#26722)
* Qt fixes for a Cray AMD system. * Update to latest changes.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index ecee1f94d0..c036326c4b 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -235,7 +235,7 @@ class Qt(Package):
'apple-clang': ('clang-libc++', 'clang'),
'clang': ('clang-libc++', 'clang'),
'gcc': ('g++',)}
- platform_mapping = {'darwin': 'macx'}
+ platform_mapping = {'darwin': ('macx'), 'cray': ('linux')}
def url_for_version(self, version):
# URL keeps getting more complicated with every release
@@ -627,6 +627,9 @@ class Qt(Package):
elif version < Version('5.15') and '+gui' in spec:
# Linux-only QT5 dependencies
config_args.append('-system-xcb')
+ if '+opengl' in spec:
+ config_args.append('-I{0}/include'.format(spec['libx11'].prefix))
+ config_args.append('-I{0}/include'.format(spec['xproto'].prefix))
if '~webkit' in spec:
config_args.extend([