Title: [236326] releases/WebKitGTK/webkit-2.22/Tools
Revision
236326
Author
[email protected]
Date
2018-09-21 10:04:18 -0700 (Fri, 21 Sep 2018)

Log Message

Merge r236275 - [WPE] fails to build on ARM arches complaining about undefined reference to `epoxy_eglMakeCurrent'
https://bugs.webkit.org/show_bug.cgi?id=189556

Reviewed by Konstantin Tokarev.

This is only a speculative build fix as I didn't attempt to reproduce. Explicitly link to
libepoxy.

* wpe/backends/CMakeLists.txt:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.22/Tools/ChangeLog (236325 => 236326)


--- releases/WebKitGTK/webkit-2.22/Tools/ChangeLog	2018-09-21 17:04:13 UTC (rev 236325)
+++ releases/WebKitGTK/webkit-2.22/Tools/ChangeLog	2018-09-21 17:04:18 UTC (rev 236326)
@@ -1,3 +1,15 @@
+2018-09-20  Michael Catanzaro  <[email protected]>
+
+        [WPE] fails to build on ARM arches complaining about undefined reference to `epoxy_eglMakeCurrent'
+        https://bugs.webkit.org/show_bug.cgi?id=189556
+
+        Reviewed by Konstantin Tokarev.
+
+        This is only a speculative build fix as I didn't attempt to reproduce. Explicitly link to
+        libepoxy.
+
+        * wpe/backends/CMakeLists.txt:
+
 2018-09-18  Chris Dumez  <[email protected]>
 
         "DidFirstVisuallyNonEmptyLayout" callback does not get called when restoring a page from PageCache

Modified: releases/WebKitGTK/webkit-2.22/Tools/wpe/backends/CMakeLists.txt (236325 => 236326)


--- releases/WebKitGTK/webkit-2.22/Tools/wpe/backends/CMakeLists.txt	2018-09-21 17:04:13 UTC (rev 236325)
+++ releases/WebKitGTK/webkit-2.22/Tools/wpe/backends/CMakeLists.txt	2018-09-21 17:04:18 UTC (rev 236326)
@@ -21,6 +21,7 @@
 set(WPEToolingBackends_SYSTEM_INCLUDE_DIRECTORIES
     ${CAIRO_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
+    ${LIBEPOXY_INCLUDE_DIRS}
     ${WPE_INCLUDE_DIRS}
     ${WPEBACKEND_FDO_INCLUDE_DIRS}
 )
@@ -28,6 +29,7 @@
 set(WPEToolingBackends_LIBRARIES
     ${CAIRO_LIBRARIES}
     ${GLIB_LIBRARIES}
+    ${LIBEPOXY_LIBRARIES}
     ${LIBXKBCOMMON_LIBRARIES}
     ${WAYLAND_LIBRARIES}
     ${WPE_LIBRARIES}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to