summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Flood <neilflood@fastmail.fm>2018-10-19 06:28:53 +1000
committerPeter Scheibel <scheibel1@llnl.gov>2018-10-18 13:28:53 -0700
commitb5815e2629d9e331f84e7fec0211dfd4fc8dc1c5 (patch)
tree1c7948de39c031fda32f21a0bee76cb31a75a886
parent38111dc68ecbe8052b61f04e5dd591488bdfacbd (diff)
downloadspack-b5815e2629d9e331f84e7fec0211dfd4fc8dc1c5.tar.gz
spack-b5815e2629d9e331f84e7fec0211dfd4fc8dc1c5.tar.bz2
spack-b5815e2629d9e331f84e7fec0211dfd4fc8dc1c5.tar.xz
spack-b5815e2629d9e331f84e7fec0211dfd4fc8dc1c5.zip
qt4: Patch configure to allow webkit with recent gcc (#9264)
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py6
-rw-r--r--var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch20
2 files changed, 26 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index e122c1d3b8..f956d77219 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -72,6 +72,12 @@ class Qt(Package):
patch('qt4-pcre-include-conflict.patch', when='@4')
patch('qt4-el-capitan.patch', when='@4')
+ # Allow Qt's configure script to build the webkit option with more
+ # recent versions of gcc.
+ # https://github.com/spack/spack/issues/9205
+ # https://github.com/spack/spack/issues/9209
+ patch('qt4-gcc-and-webkit.patch', when='@4')
+
# Use system openssl for security.
depends_on("openssl")
depends_on("glib", when='@4:')
diff --git a/var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch b/var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch
new file mode 100644
index 0000000000..38a1c350f3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch
@@ -0,0 +1,20 @@
+--- a/configure.orig 2018-09-18 07:02:33.866633000 +1000
++++ b/configure 2018-09-18 07:05:21.935194000 +1000
+@@ -7708,7 +7708,7 @@
+
+ # Check gcc's version
+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+- 4*)
++ [4-8]*)
+ ;;
+ 3.4*)
+ canBuildQtXmlPatterns="no"
+@@ -7729,7 +7729,7 @@
+ *-g++*)
+ # Check gcc's version
+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+- 4*|3.4*)
++ [4-8]*|3.4*)
+ ;;
+ 3.3*)
+ canBuildWebKit="no"