Title: [154051] trunk/Source/WebCore
Revision
154051
Author
[email protected]
Date
2013-08-14 09:42:23 -0700 (Wed, 14 Aug 2013)

Log Message

[CMake] Fix building with bison-3.0.
https://bugs.webkit.org/show_bug.cgi?id=119788

Patch by Gabor Abraham <[email protected]> on 2013-08-14
Reviewed by Zoltan Herczeg.

No new tests, just build fix.

* CMakeLists.txt:

Modified Paths

Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (154050 => 154051)


--- trunk/Source/WebCore/CMakeLists.txt	2013-08-14 16:19:21 UTC (rev 154050)
+++ trunk/Source/WebCore/CMakeLists.txt	2013-08-14 16:42:23 UTC (rev 154051)
@@ -2851,9 +2851,13 @@
         ${OPENGL_gl_LIBRARY}
     )
 
-    if (BISON_VERSION EQUAL "2.5")
+    if (BISON_VERSION EQUAL "2.5" OR NOT (BISON_VERSION LESS "3.0"))
         # Bison 2.5 can not compile generated glslang.
         # See https://bugs.webkit.org/show_bug.cgi?id=93487
+        #
+        # With Bison 3.0 or greater the generated glslang will not compile.
+        # See https://bugs.webkit.org/show_bug.cgi?id=119373
+        # Use already generated glslang.
         list(APPEND ANGLESupport_SOURCES
             ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang_lex.cpp
             ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang_tab.cpp

Modified: trunk/Source/WebCore/ChangeLog (154050 => 154051)


--- trunk/Source/WebCore/ChangeLog	2013-08-14 16:19:21 UTC (rev 154050)
+++ trunk/Source/WebCore/ChangeLog	2013-08-14 16:42:23 UTC (rev 154051)
@@ -1,3 +1,14 @@
+2013-08-14  Gabor Abraham  <[email protected]>
+
+        [CMake] Fix building with bison-3.0.
+        https://bugs.webkit.org/show_bug.cgi?id=119788
+
+        Reviewed by Zoltan Herczeg.
+
+        No new tests, just build fix.
+
+        * CMakeLists.txt:
+
 2013-08-14  Rob Buis  <[email protected]>
 
         ASSERTION FAILED: resultAnimationElement->m_animatedType in WebCore::SVGAnimateElement::calculateAnimatedValue
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to