qt4: Patch configure to allow webkit with recent gcc (#9264)
This commit is contained in:
parent
38111dc68e
commit
b5815e2629
@ -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:')
|
||||
|
20
var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch
Normal file
20
var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch
Normal file
@ -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"
|
Loading…
Reference in New Issue
Block a user