hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qt+webkit: fix python2 dependency and add opengl conflict (#24276)

Browse source
This commit is contained in:
Manuela Kuhn 2021-06-11 19:24:28 +02:00 committed by GitHub
parent 44a8e17549
commit adc4699c3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
var/spack/repos/builtin/packages/qt/package.py
View file

@ -160,7 +160,7 @@ class Qt(Package):
depends_on("gperf", when='+webkit') depends_on("gperf", when='+webkit')
depends_on("gtkplus", when='+gtk') depends_on("gtkplus", when='+gtk')
depends_on("openssl", when='+ssl') 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("sqlite+column_metadata", when='+sql', type=('build', 'run'))
depends_on("libpng@1.2.57", when='@3') depends_on("libpng@1.2.57", when='@3')
@ -179,6 +179,9 @@ class Qt(Package):
depends_on("pcre2+multibyte", when='@5.9:') depends_on("pcre2+multibyte", when='@5.9:')
depends_on("llvm", when='@5.11: +doc') 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 # gcc@4 is not supported as of Qt@5.14
# https://doc.qt.io/qt-5.14/supported-platforms.html # https://doc.qt.io/qt-5.14/supported-platforms.html
conflicts('%gcc@:4.99', when='@5.14:') conflicts('%gcc@:4.99', when='@5.14:')