diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/qt/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 527a47f623..195eed5543 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -81,18 +81,16 @@ class Qt(Package): patch('qt4-gcc-and-webkit.patch', when='@4') # Fix build failure with newer versions of GCC - # https://bugreports.qt.io/browse/QTBUG-74196 - patch('https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.patch', - sha256='ae88481a3ff63ab058cf9da6f5ae4397a983903109d907fb2ce4fcf91f9ca5e6', - 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:') + # https://bugreports.qt.io/browse/QTBUG-74196 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89585 + patch('qt4-gcc8.3-asm-volatile-fix.patch', when='@4') + patch('qt5-gcc8.3-asm-volatile-fix.patch', when='@5.0.0:5.12.1') + depends_on("pkgconfig", type='build') # Use system openssl for security. depends_on("openssl@:1.0", when='@:5.9') |