Changeset 278768 in webkit

Timestamp:

Jun 11, 2021, 11:08:32 AM (5 years ago)

Author:

commit-queue@webkit.org

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 <hikiko> 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:

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• CMakeLists.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/CMakeLists.txt

@@ -152 +152 @@
         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
@@ -175 +177 @@
             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)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-06-11  Eleni Maria Stea  <estea@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.olmstead@sony.com>