summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>2023-10-01 14:31:11 +0200
committerGitHub <noreply@github.com>2023-10-01 21:31:11 +0900
commit9120b6644d5b5deb391a7d96da581ac86f1dd8a1 (patch)
tree82bed01bce91a2a488644dacb134241ccde34a09
parent68dbd25f5f9b135630fe6d055427854a0a89843a (diff)
downloadspack-9120b6644d5b5deb391a7d96da581ac86f1dd8a1.tar.gz
spack-9120b6644d5b5deb391a7d96da581ac86f1dd8a1.tar.bz2
spack-9120b6644d5b5deb391a7d96da581ac86f1dd8a1.tar.xz
spack-9120b6644d5b5deb391a7d96da581ac86f1dd8a1.zip
qt: change version for opengl dependencies (#39718)
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index daf4933072..971a3c2505 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -689,9 +689,12 @@ class Qt(Package):
# Errors on bluetooth even when bluetooth is disabled...
# at least on apple-clang%12
config_args.extend(["-skip", "connectivity"])
- elif version < Version("5.15") and "+gui" in spec:
+ elif "+gui" in spec:
# Linux-only QT5 dependencies
- config_args.append("-system-xcb")
+ if version < Version("5.9.9"):
+ config_args.append("-system-xcb")
+ else:
+ config_args.append("-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))