diff options
| author | healther <healther@users.noreply.github.com> | 2018-06-07 17:50:05 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-06-07 10:50:05 -0500 |
| commit | af881b8c2edf8896cb563648b2164410b331ccbc (patch) | |
| tree | 12c448d2134091d8232de4ab721916f111a2f6d5 /var | |
| parent | a6e0837b3173354af6785adb2fd7afa89f16e485 (diff) | |
| download | spack-af881b8c2edf8896cb563648b2164410b331ccbc.tar.gz spack-af881b8c2edf8896cb563648b2164410b331ccbc.tar.bz2 spack-af881b8c2edf8896cb563648b2164410b331ccbc.tar.xz spack-af881b8c2edf8896cb563648b2164410b331ccbc.zip | |
fix qt@5.8: build on systems without wayland (#8417)
* fix qt@5.8: build on systems without wayland
Change-Id: I56b83208edd46f50e003d82c071e296e905bfb15
* add links
Change-Id: Ia16fc20632690340f33df77fbdcb1a166d49cedc
* move 5.8 comparison into 5.7 configure block
Change-Id: I7dc606beeb5b5bf4e8263bc50d28de6591633c99
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index a9ce442966..6bcc16a6bf 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -378,6 +378,12 @@ class Qt(Package): '-skip', 'webglplugin', ]) + if self.version > Version('5.8'): + # relies on a system installed wayland, i.e. no spack package yet + # https://wayland.freedesktop.org/ubuntu16.04.html + # https://wiki.qt.io/QtWayland + config_args.extend(['-skip', 'wayland']) + configure('-no-eglfs', '-no-directfb', '-{0}gtk'.format('' if '+gtk' in self.spec else 'no-'), |