Title: [153749] trunk/Source
- Revision
- 153749
- Author
- zandober...@gmail.com
- Date
- 2013-08-06 05:45:10 -0700 (Tue, 06 Aug 2013)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (153748 => 153749)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-06 11:45:58 UTC (rev 153748)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-06 12:45:10 UTC (rev 153749)
@@ -1,3 +1,15 @@
+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: 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-08-05 Alex Christensen <achristen...@apple.com>
Added optimizations to Windows ANGLE builds.
Modified: trunk/Source/ThirdParty/ANGLE/GNUmakefile.am (153748 => 153749)
--- trunk/Source/ThirdParty/ANGLE/GNUmakefile.am 2013-08-06 11:45:58 UTC (rev 153748)
+++ trunk/Source/ThirdParty/ANGLE/GNUmakefile.am 2013-08-06 12:45:10 UTC (rev 153749)
@@ -1,6 +1,9 @@
if USE_OPENGL
noinst_LTLIBRARIES += \
libANGLE.la
+
+angle_lib_for_dep = libANGLE.la
+$(angle_lib_for_dep): $(srcdir)/Source/ThirdParty/ANGLE/GNUmakefile.am
endif
libANGLE_la_CXXFLAGS = $(global_cxxflags)
@@ -12,11 +15,6 @@
-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
-I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR
-nodist_libANGLE_la_SOURCES = \
- DerivedSources/ANGLE/glslang.cpp \
- DerivedSources/ANGLE/glslang_tab.cpp \
- DerivedSources/ANGLE/glslang_tab.h
-
libANGLE_la_SOURCES = \
Source/ThirdParty/ANGLE/include/EGL/egl.h \
Source/ThirdParty/ANGLE/include/EGL/eglplatform.h \
@@ -53,6 +51,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 \
Modified: trunk/Source/WebCore/ChangeLog (153748 => 153749)
--- trunk/Source/WebCore/ChangeLog 2013-08-06 11:45:58 UTC (rev 153748)
+++ trunk/Source/WebCore/ChangeLog 2013-08-06 12:45:10 UTC (rev 153749)
@@ -1,3 +1,12 @@
+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.
+
2013-06-26 Sergio Villar Senin <svil...@igalia.com>
[CSS Grid Layout] Add support for parsing <grid-line> that includes a 'span'
Modified: trunk/Source/WebCore/GNUmakefile.am (153748 => 153749)
--- trunk/Source/WebCore/GNUmakefile.am 2013-08-06 11:45:58 UTC (rev 153748)
+++ trunk/Source/WebCore/GNUmakefile.am 2013-08-06 12:45:10 UTC (rev 153749)
@@ -349,14 +349,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 DerivedSources/ANGLE/glslang_tab.cpp
- $(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/battery \
$(WebCore)/Modules/filesystem \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
