webkit-gtk fails to build with bison-3.0
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Aug 2013 12:45:10 +0000 (12:45 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Aug 2013 12:45:10 +0000 (12:45 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153749 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/GNUmakefile.am
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am

index e12d339f682d8ea71d3c6b538336efa725d01609..05ecd7d00b0436c8582e012c11f3cdedfc9deade 100644 (file)
@@ -1,3 +1,15 @@
+2013-08-06  Zan Dobersek  <zdobersek@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  <achristensen@apple.com>
 
         Added optimizations to Windows ANGLE builds.
index bcefd2cd516655dcd60e3c906f3bfb2c333f5200..f5c1dd78f79f1a176c404be16229340d5b191056 100644 (file)
@@ -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 @@ libANGLE_la_CPPFLAGS = \
        -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 @@ libANGLE_la_SOURCES = \
        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 \
index 634d5f05fec35b92c563ffb811a8a89fe07e7ba1..4355f2deecb76c7c77b5a6064011c57e159b0e11 100644 (file)
@@ -1,3 +1,12 @@
+2013-08-06  Zan Dobersek  <zdobersek@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  <svillar@igalia.com>
 
         [CSS Grid Layout] Add support for parsing <grid-line> that includes a 'span'
index acf4c63aeb4aebf124bfc0514a798553c44e214a..f0f42944a386e39a2f00414825aa02a6b17d237c 100644 (file)
@@ -349,14 +349,6 @@ audio_DATA = $(WebCore)/platform/audio/resources/Composite.wav
 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 \