zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: fix pcre header conflict in javascriptcore

Browse Source
This commit is contained in:
Ben Boeckel 2016-08-29 15:41:53 -04:00
parent 4687860885
commit 67462ca65a
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/qt/package.py
View File

@ -56,6 +56,7 @@ class Qt(Package):
patch('btn_trigger_happy.patch', when='@5.7.0:') patch('btn_trigger_happy.patch', when='@5.7.0:')
patch('qt4-corewlan-new-osx.patch', when='@4') patch('qt4-corewlan-new-osx.patch', when='@4')
patch('qt4-pcre-include-conflict.patch', when='@4')
patch('qt4-el-capitan.patch', when='@4') patch('qt4-el-capitan.patch', when='@4')
# Use system openssl for security. # Use system openssl for security.

16
var/spack/repos/builtin/packages/qt/qt4-pcre-include-conflict.patch Normal file
View File

@ -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