Title: [153900] releases/WebKitGTK/webkit-2.0/Source/WebCore
- Revision
- 153900
- Author
- k...@webkit.org
- Date
- 2013-08-09 10:25:50 -0700 (Fri, 09 Aug 2013)
Log Message
Merge 153749 - webkit-gtk fails to build with bison-3.0
https://bugs.webkit.org/show_bug.cgi?id=119373
Reviewed by Gustavo Noronha Silva.
Source/ThirdParty/ANGLE:
* GNUmakefile.am: Stop relying on generated glslang_tab.(cpp|h) and glslang.cpp sources as Bison 3.0
produces non-compilable source code. Instead, compile these pregenerated files as they're included in
the tree. Originally, the ANGLE source tree provides these files as generated by Bison 2.7, but they're
at the moment regenerated with Bison 2.3 when the third-party ANGLE source is being updated.
Source/WebCore:
* GNUmakefile.am: Remove rules for generating ANGLE's glslang source files with Bison.
Conflicts:
Source/ThirdParty/ANGLE/GNUmakefile.am
Source/WebCore/GNUmakefile.am
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (153899 => 153900)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-08-09 17:09:42 UTC (rev 153899)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-08-09 17:25:50 UTC (rev 153900)
@@ -1,3 +1,16 @@
+2013-08-06 Zan Dobersek <zdober...@igalia.com>
+
+ webkit-gtk fails to build with bison-3.0
+ https://bugs.webkit.org/show_bug.cgi?id=119373
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Remove rules for generating ANGLE's glslang source files with Bison.
+ Stop relying on generated glslang_tab.(cpp|h) and glslang.cpp sources as Bison 3.0
+ produces non-compilable source code. Instead, compile these pregenerated files as they're included in
+ the tree. Originally, the ANGLE source tree provides these files as generated by Bison 2.7, but they're
+ at the moment regenerated with Bison 2.3 when the third-party ANGLE source is being updated.
+
2013-05-03 Xabier Rodriguez Calvar <calva...@igalia.com>
[GStreamer] GStreamer log crashes in MediaPlayerPrivateGStreamerBase because of uninitialized category
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/GNUmakefile.am (153899 => 153900)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/GNUmakefile.am 2013-08-09 17:09:42 UTC (rev 153899)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/GNUmakefile.am 2013-08-09 17:25:50 UTC (rev 153900)
@@ -352,14 +352,6 @@
dist_audio_DATA = $(audio_DATA)
endif # END ENABLE_WEB_AUDIO
-# ANGLE tokenizer & parser
-DerivedSources/ANGLE/glslang.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.l
- $(AM_V_GEN)$(FLEX) --noline --nounistd --outfile="$@" "$<"
-
-DerivedSources/ANGLE/glslang_tab.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.y
- $(AM_V_GEN)$(BISON) --no-lines --defines="DerivedSources/ANGLE/glslang_tab.h" --skeleton=yacc.c --output="$@" $<
-DerivedSources/ANGLE/glslang_tab.h: DerivedSources/ANGLE/glslang_tab.cpp
-
IDL_PATH := \
$(WebCore)/Modules/filesystem \
$(WebCore)/Modules/gamepad \
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/GNUmakefile.list.am (153899 => 153900)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/GNUmakefile.list.am 2013-08-09 17:09:42 UTC (rev 153899)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/GNUmakefile.list.am 2013-08-09 17:25:50 UTC (rev 153900)
@@ -6305,11 +6305,6 @@
# 3D canvas (WebGL) support
# ---
if ENABLE_WEBGL
-webcore_built_sources += \
- DerivedSources/ANGLE/glslang.cpp \
- DerivedSources/ANGLE/glslang_tab.cpp \
- DerivedSources/ANGLE/glslang_tab.h
-
webcore_sources += \
Source/ThirdParty/ANGLE/include/EGL/egl.h \
Source/ThirdParty/ANGLE/include/EGL/eglplatform.h \
@@ -6346,6 +6341,9 @@
Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.cpp \
Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.h \
Source/ThirdParty/ANGLE/src/compiler/glslang.h \
+ Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp \
+ Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp \
+ Source/ThirdParty/ANGLE/src/compiler/glslang_tab.h \
Source/ThirdParty/ANGLE/src/compiler/HashNames.h \
Source/ThirdParty/ANGLE/src/compiler/InfoSink.cpp \
Source/ThirdParty/ANGLE/src/compiler/InfoSink.h \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
