diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2016-08-29 15:41:53 -0400 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2016-09-06 16:00:21 -0400 |
| commit | 67462ca65a00a718e7713ecd6257de5309de4a14 (patch) | |
| tree | 7be3bcc2a997eeafacd9a72c6317dc5769a3d844 | |
| parent | 4687860885fc06ba8d911e99408b6a9f4221c64e (diff) | |
| download | spack-67462ca65a00a718e7713ecd6257de5309de4a14.tar.gz spack-67462ca65a00a718e7713ecd6257de5309de4a14.tar.bz2 spack-67462ca65a00a718e7713ecd6257de5309de4a14.tar.xz spack-67462ca65a00a718e7713ecd6257de5309de4a14.zip | |
qt: fix pcre header conflict in javascriptcore
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/qt4-pcre-include-conflict.patch | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 78bc4bed9c..25c896074b 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -56,6 +56,7 @@ class Qt(Package): patch('btn_trigger_happy.patch', when='@5.7.0:') patch('qt4-corewlan-new-osx.patch', when='@4') + patch('qt4-pcre-include-conflict.patch', when='@4') patch('qt4-el-capitan.patch', when='@4') # Use system openssl for security. diff --git a/var/spack/repos/builtin/packages/qt/qt4-pcre-include-conflict.patch b/var/spack/repos/builtin/packages/qt/qt4-pcre-include-conflict.patch new file mode 100644 index 0000000000..854e564bfb --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt4-pcre-include-conflict.patch @@ -0,0 +1,16 @@ +diff -U5 -Nru qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h qt-everywhere-opensource-src-4.8.6.pcre/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h +--- qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h 2014-04-10 14:37:12.000000000 -0400 ++++ qt-everywhere-opensource-src-4.8.6.pcre/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h 2016-08-29 15:30:02.216546252 -0400 +@@ -32,11 +32,11 @@ + + #include "MacroAssembler.h" + #include "RegexPattern.h" + #include <UString.h> + +-#include <pcre.h> ++#include <pcre/pcre.h> + struct JSRegExp; // temporary, remove when fallback is removed. + + #if CPU(X86) && !COMPILER(MSVC) + #define YARR_CALL __attribute__ ((regparm (3))) + #else |