diff options
| author | Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> | 2021-06-11 19:24:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 17:24:28 +0000 |
| commit | adc4699c3adb343b7f4dcd92cc078ffdd4a76e5f (patch) | |
| tree | 8e260c4fbe780ef60fbcb7dad1016455a0df360f | |
| parent | 44a8e17549c5c218be1a019d52f0e4ed54390e7a (diff) | |
| download | spack-adc4699c3adb343b7f4dcd92cc078ffdd4a76e5f.tar.gz spack-adc4699c3adb343b7f4dcd92cc078ffdd4a76e5f.tar.bz2 spack-adc4699c3adb343b7f4dcd92cc078ffdd4a76e5f.tar.xz spack-adc4699c3adb343b7f4dcd92cc078ffdd4a76e5f.zip | |
qt+webkit: fix python2 dependency and add opengl conflict (#24276)
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 5 |
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 26b205f253..e0d6081e70 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -160,7 +160,7 @@ class Qt(Package): depends_on("gperf", when='+webkit') depends_on("gtkplus", when='+gtk') depends_on("openssl", when='+ssl') - depends_on("python@2.7.5:2.999", when='@5.14: +webkit', type='build') + depends_on("python@2.7.5:2.999", when='+webkit', type='build') depends_on("sqlite+column_metadata", when='+sql', type=('build', 'run')) depends_on("libpng@1.2.57", when='@3') @@ -179,6 +179,9 @@ class Qt(Package): depends_on("pcre2+multibyte", when='@5.9:') depends_on("llvm", when='@5.11: +doc') + # the gl headers are needed to build webkit + conflicts('~opengl', when='+webkit') + # gcc@4 is not supported as of Qt@5.14 # https://doc.qt.io/qt-5.14/supported-platforms.html conflicts('%gcc@:4.99', when='@5.14:') |