diff options
| author | Angel de Vicente <angel.de.vicente@iac.es> | 2020-11-29 22:45:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-29 17:45:41 -0500 |
| commit | 08c9a6e2b0cba62dcedec4a2a00024704dda2001 (patch) | |
| tree | 41b22e12320c15ac8d1eff3c72aeca88afcf511e | |
| parent | cc53ff162fa09e4378c318bbb8e7d7f6ebeca500 (diff) | |
| download | spack-08c9a6e2b0cba62dcedec4a2a00024704dda2001.tar.gz spack-08c9a6e2b0cba62dcedec4a2a00024704dda2001.tar.bz2 spack-08c9a6e2b0cba62dcedec4a2a00024704dda2001.tar.xz spack-08c9a6e2b0cba62dcedec4a2a00024704dda2001.zip | |
Qt: fix GCC (#19948)
tested only for gcc8.3.0 but should be safe for other compilers
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/qt514.patch | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index b3a7fec6d3..0c8956681f 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -121,6 +121,7 @@ class Qt(Package): patch('qt5-12-configure.patch', when='@5.12') # https://bugreports.qt.io/browse/QTBUG-93402 patch('qt5-15-gcc-10.patch', when='@5.12.7:5.15 %gcc@8:') + patch('qt514.patch', when='@5.14') conflicts('%gcc@10:', when='@5.9:5.12.6 +opengl') # Build-only dependencies diff --git a/var/spack/repos/builtin/packages/qt/qt514.patch b/var/spack/repos/builtin/packages/qt/qt514.patch new file mode 100644 index 0000000000..d752a52bf7 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt514.patch @@ -0,0 +1,9 @@ +diff -ruN qt-everywhere-src-5.14.2.orig/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp qt-everywhere-src-5.14.2/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp +--- qt-everywhere-src-5.14.2.orig/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp 2020-03-03 13:10:30.000000000 +0000 ++++ qt-everywhere-src-5.14.2/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp 2020-11-16 19:57:56.792619032 +0000 +@@ -38,4 +38,5 @@ + ** + ****************************************************************************/ + ++#include <math.h> + #include "qjp2handler_p.h" |