zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: @5.8:5.14.2 don't build with gcc@11, fix build of 5.6.3 (#27072)

Browse Source 
5.14.2 fails with %gcc@11 with Error: 'numeric_limits' is not a class template
5.8.0 has multiple compile failures as well: Extend the conflict to those too.
- Fix also the confgigure of @5.6.3 (tested with %gcc@11)
This commit is contained in:
Bernhard Kaindl 2021-11-01 02:22:15 +01:00 committed by GitHub
parent 6c1f952bda
commit 6344d163b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
var/spack/repos/builtin/packages/qt/package.py
View File

@ -143,7 +143,8 @@ class Qt(Package):
working_dir='qtwebsockets', working_dir='qtwebsockets',
when='@5.14: %gcc@11:') when='@5.14: %gcc@11:')
conflicts('%gcc@10:', when='@5.9:5.12.6 +opengl') conflicts('%gcc@10:', when='@5.9:5.12.6 +opengl')
conflicts('%gcc@11:', when='@5.9:5.13') # Error: 'numeric_limits' is not a class template
conflicts('%gcc@11:', when='@5.8:5.14')
# Build-only dependencies # Build-only dependencies
depends_on("pkgconfig", type='build') depends_on("pkgconfig", type='build')
@ -523,10 +524,10 @@ def use_spack_dep(spack_pkg, qt_name=None):
use_spack_dep('jpeg', 'libjpeg') use_spack_dep('jpeg', 'libjpeg')
use_spack_dep('zlib') use_spack_dep('zlib')
if '@:5.7.0' in spec: if '@:5.5' in spec:
config_args.extend([ config_args.extend([
# NIS is deprecated in more recent glibc, # NIS is deprecated in more recent glibc,
# but qt-5.7.1 does not recognize this option # but qt-5.6.3 does not recognize this option
'-no-nis', '-no-nis',
]) ])
@ -635,7 +636,7 @@ def configure(self, spec, prefix):
if '~webkit' in spec: if '~webkit' in spec:
config_args.extend([ config_args.extend([
'-skip', '-skip',
'webengine' if version >= Version('5.7') else 'qtwebkit', 'webengine' if version >= Version('5.6') else 'qtwebkit',
]) ])
if spec.satisfies('@5.7'): if spec.satisfies('@5.7'):