summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2015-04-14 02:07:14 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:19:06 +0100
commit32d71ce184aa036b21116fcfaad799be59579329 (patch)
treed39e33cf74e1a3a4a6c42957f5f4baa63b809914 /meta/recipes-sato
parente20e186959c64a6cb405761417969429ddf6011e (diff)
downloadopenembedded-core-32d71ce184aa036b21116fcfaad799be59579329.tar.gz
webkit-gtk: ANGLE doesn't build with bison 3
Use %lex-param to set YYLEX_PARAM. Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch26
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb1
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch b/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch
new file mode 100644
index 0000000000..e7e908342a
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch
@@ -0,0 +1,26 @@
+webkit-gtk: ANGLE doesn't build with bison 3
+
+Use %lex-param to set YYLEX_PARAM.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
+---
+ Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+index ec1a85c..15723cc 100644
+--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -32,6 +32,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+
+ %union {
+ struct {
+--
+1.9.1
+
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
index 15c73cfca8..3f19c2d204 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
@@ -26,6 +26,7 @@ SRC_URI = "\
file://obsolete_automake_macros.patch \
file://0001-Enable-mips64-build.patch \
file://aarch64.patch \
+ file://webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch \
"
SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"