summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kuhn <michael.kuhn@informatik.uni-hamburg.de>2019-05-09 18:28:56 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2019-05-09 11:28:56 -0500
commit4e0c909d0a8d3458af7057161f004897ebbbb76c (patch)
treea49007b36a2cfbcf0674193c559ea21348628abb
parent2b378f27a2a705dd336a9e75d3a2f214a697cca7 (diff)
downloadspack-4e0c909d0a8d3458af7057161f004897ebbbb76c.tar.gz
spack-4e0c909d0a8d3458af7057161f004897ebbbb76c.tar.bz2
spack-4e0c909d0a8d3458af7057161f004897ebbbb76c.tar.xz
spack-4e0c909d0a8d3458af7057161f004897ebbbb76c.zip
qt: Fix build with gcc@9 (#11391)
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py6
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 5cc5c835c0..dd723df44a 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -86,6 +86,12 @@ class Qt(Package):
working_dir='qtscript',
when='@5.0:5.12 %gcc@8.3:')
+ # Fix build failure with newer versions of GCC
+ patch('https://github.com/qt/qtbase/commit/a52d7861edfb5956de38ba80015c4dd0b596259b.patch',
+ sha256='e10c871033568a9aed982628ed627356761f72f63c5fdaf11882dc147528e9ed',
+ working_dir='qtbase',
+ when='@5.10:5.12.0 %gcc@9:')
+
depends_on("pkgconfig", type='build')
# Use system openssl for security.
depends_on("openssl@:1.0", when='@:5.9')