Title: [278768] trunk/Source/ThirdParty/ANGLE
- Revision
- 278768
- Author
- commit-qu...@webkit.org
- Date
- 2021-06-11 11:08:32 -0700 (Fri, 11 Jun 2021)
Log Message
ANGLE EGL and GLES libraries should link with lib dl.
https://bugs.webkit.org/show_bug.cgi?id=226920
Patch by Eleni Maria Stea <es...@igalia.com> on 2021-06-11
Reviewed by Kenneth Russell.
GLES and EGL that are generated from ANGLE should link
with libdl because they use dlsym and dlopen. Also,
with the updated CMakeLists.txt we can safely link with libEGL
when USE_ANGLE_WEBGL is set because the symbols of EGL are now
found.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (278767 => 278768)
--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2021-06-11 17:46:08 UTC (rev 278767)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2021-06-11 18:08:32 UTC (rev 278768)
@@ -151,7 +151,9 @@
${no_gl_prototypes}
LIBGLESV2_IMPLEMENTATION
)
- target_link_libraries(GLESv2 PRIVATE ${ANGLEGLESv2_LIBRARIES})
+
+ target_link_libraries(GLESv2 PRIVATE ${ANGLEGLESv2_LIBRARIES} ${CMAKE_DL_LIBS})
+
if (WIN32)
# Output library name according to the .def
target_sources(GLESv2 PRIVATE src/libGLESv2/libGLESv2_autogen.def)
@@ -174,7 +176,9 @@
${gl_prototypes}
EGLAPI=
)
- target_link_libraries(EGL PRIVATE GLESv2)
+
+ target_link_libraries(EGL PRIVATE GLESv2 ${CMAKE_DL_LIBS})
+
set_target_properties(EGL PROPERTIES LINKER_LANGUAGE CXX)
if (WIN32)
# Output library names according to the .def
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (278767 => 278768)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-06-11 17:46:08 UTC (rev 278767)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-06-11 18:08:32 UTC (rev 278768)
@@ -1,3 +1,18 @@
+2021-06-11 Eleni Maria Stea <es...@igalia.com>
+
+ ANGLE EGL and GLES libraries should link with lib dl.
+ https://bugs.webkit.org/show_bug.cgi?id=226920
+
+ Reviewed by Kenneth Russell.
+
+ GLES and EGL that are generated from ANGLE should link
+ with libdl because they use dlsym and dlopen. Also,
+ with the updated CMakeLists.txt we can safely link with libEGL
+ when USE_ANGLE_WEBGL is set because the symbols of EGL are now
+ found.
+
+ * CMakeLists.txt:
+
2021-06-10 Don Olmstead <don.olmst...@sony.com>
[CMake] Make ANGLE library types configurable
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
