Fix build breakage with the latest EFL code

After EFL library upgrade, webkit2-efl failed to build
because wrong libraries got added to -Wl,--whole-archive/
-Wl,--no-whole-archive linker options.

Fix by moving --[no-]whole-arhive to a proper place.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index cdb6a46..60695e5 100755 (executable)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -2697,9 +2697,6 @@ INCLUDE(${WEBCORE_DIR}/UseJSC.cmake)
 #        Upversion should keep "-Wl,--whole-archive ${JavaScriptCore_LIBRARY_NAME} -Wl,--no-whole-archive"
 SET(WebCore_LIBRARIES
      ${WTF_LIBRARY_NAME}
-    "-Wl,--whole-archive"
-    ${JavaScriptCore_LIBRARY_NAME}
-    "-Wl,--no-whole-archive"
 )
     
 SET(WebCore_LINK_FLAGS "")

diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
index 055f777..34075b5 100644 (file)
--- a/Source/WebKit2/CMakeLists.txt
+++ b/Source/WebKit2/CMakeLists.txt
@@ -632,6 +632,9 @@ ENDFOREACH ()
 
 LIST(APPEND WebKit2_LIBRARIES
     ${WebCore_LIBRARY_NAME}
+    "-Wl,--whole-archive"
+    ${JavaScriptCore_LIBRARY_NAME}
+    "-Wl,--no-whole-archive"
 )
 
 ADD_DEFINITIONS(-DBUILDING_WEBKIT)

diff --git a/Source/WebKit2/PlatformTizen.cmake b/Source/WebKit2/PlatformTizen.cmake
index 39a0c2e..b4f26ee 100755 (executable)
--- a/Source/WebKit2/PlatformTizen.cmake
+++ b/Source/WebKit2/PlatformTizen.cmake
@@ -293,7 +293,9 @@ ENDIF ()
 FIND_PACKAGE (X11 REQUIRED)
 
 SET(PluginProcess_LIBRARIES
+    "-Wl,--whole-archive"
     ${JavaScriptCore_LIBRARY_NAME}
+    "-Wl,--no-whole-archive"
     ${WebCore_LIBRARY_NAME}
     ${WebKit2_LIBRARY_NAME}
     ${X11_LIBRARIES}