summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
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:20:26 +0100
commit2b49fba71f83de4d0645a7def2d9437a727b6346 (patch)
treeef07cb867421e23e458cc3e64afb05a372540b79 /meta/recipes-sato/webkit
parent4f358389b21bd2cc9a8c2876311274f8f16c5b7c (diff)
downloadpoky-2b49fba71f83de4d0645a7def2d9437a727b6346.tar.gz
webkit-gtk: ANGLE doesn't build with bison 3
Use %lex-param to set YYLEX_PARAM. (From OE-Core rev: 32d71ce184aa036b21116fcfaad799be59579329) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-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 @@
1webkit-gtk: ANGLE doesn't build with bison 3
2
3Use %lex-param to set YYLEX_PARAM.
4
5Upstream-Status: Pending
6
7Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
8---
9 Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
13index ec1a85c..15723cc 100644
14--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
15+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
16@@ -32,6 +32,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
17 %expect 1 /* One shift reduce conflict because of if | else */
18 %pure-parser
19 %parse-param {TParseContext* context}
20+%lex-param {YYLEX_PARAM}
21
22 %union {
23 struct {
24--
251.9.1
26
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 = "\
26 file://obsolete_automake_macros.patch \ 26 file://obsolete_automake_macros.patch \
27 file://0001-Enable-mips64-build.patch \ 27 file://0001-Enable-mips64-build.patch \
28 file://aarch64.patch \ 28 file://aarch64.patch \
29 file://webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch \
29 " 30 "
30 31
31SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6" 32SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"