Changeset 172377 in webkit

Timestamp:

Aug 10, 2014 12:30:26 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] REGRESSION(r166239): The ld version script is not being used
​https://bugs.webkit.org/show_bug.cgi?id=135694

Reviewed by Martin Robinson.

.:

Move the symbols filter file from Tools/gtk to Source/cmake and rename
it as gtksymbols.filter. Also updated it, since some of the symbols
exported were renamed.

• Source/cmake/OptionsGTK.cmake:
• Source/cmake/gtksymbols.filter: Renamed from Tools/gtk/symbols.filter.

Source/WebKit2:

• CMakeLists.txt: Add VERSION_SCRIPT to WebKit2 link flags if present.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/CMakeLists.txt (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)
• Source/cmake/gtksymbols.filter (moved) (moved from trunk/Tools/gtk/symbols.filter) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2014-08-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] REGRESSION(r166239): The ld version script is not being used
+        https://bugs.webkit.org/show_bug.cgi?id=135694
+
+        Reviewed by Martin Robinson.
+
+        Move the symbols filter file from Tools/gtk to Source/cmake and rename
+        it as gtksymbols.filter. Also updated it, since some of the symbols
+        exported were renamed.
+
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/gtksymbols.filter: Renamed from Tools/gtk/symbols.filter.
+
 2014-08-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/CMakeLists.txt

@@ -705 +705 @@
 set_target_properties(WebKit2 PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
+if (WebKit2_VERSION_SCRIPT)
+    ADD_TARGET_PROPERTIES(WebKit2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")
+endif ()
+
 if (WebKit2_OUTPUT_NAME)
     set_target_properties(WebKit2 PROPERTIES OUTPUT_NAME ${WebKit2_OUTPUT_NAME})

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-08-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] REGRESSION(r166239): The ld version script is not being used
+        https://bugs.webkit.org/show_bug.cgi?id=135694
+
+        Reviewed by Martin Robinson.
+
+        * CMakeLists.txt: Add VERSION_SCRIPT to WebKit2 link flags if present.
+
 2014-08-09  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -92 +92 @@
     set(ENABLE_TOOLS OFF)
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF)
-    set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/autotools/symbols.filter")
+    set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
 endif ()
 

trunk/Source/cmake/gtksymbols.filter

@@ -2 +2 @@
 global:
   webkit_*;
-  WebProcessMainGtk;
-  NetworkProcessMain;
+  WebProcessMainUnix;
+  NetworkProcessMainUnix;
+  PluginProcessMainUnix;
   _ZN6WebKit22WebGtkExtensionManager10initializeEPK14OpaqueWKBundlePKv;
   _ZN6WebKit22WebGtkExtensionManager6sharedEv;