[BlackBerry] Fix "-fPIC" define in the BlackBerry build
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Aug 2012 00:18:01 +0000 (00:18 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Aug 2012 00:18:01 +0000 (00:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=93548

Patch by Ming Xie <mxie@rim.com> on 2012-08-08
Reviewed by Rob Buis.

In the current CMake release (version 2.8.5), ${CMAKE_SHARED
_LIBRARY_C_FLAGS} and ${CMAKE_SHARED_LIBRARY_CXX_FLAGS} is
set to empty (See cmake/Modules/Platform/QNX.cmake)

This breaks the assumption which WebKit CMake build system
makes in Source/cmake/WebKitHelper.cmake

* Source/cmake/OptionsBlackBerry.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125121 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/OptionsBlackBerry.cmake

index 927e893..5fcd46d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-08-08  Ming Xie  <mxie@rim.com>
+
+        [BlackBerry] Fix "-fPIC" define in the BlackBerry build
+        https://bugs.webkit.org/show_bug.cgi?id=93548
+
+        Reviewed by Rob Buis.
+
+        In the current CMake release (version 2.8.5), ${CMAKE_SHARED
+        _LIBRARY_C_FLAGS} and ${CMAKE_SHARED_LIBRARY_CXX_FLAGS} is
+        set to empty (See cmake/Modules/Platform/QNX.cmake)
+
+        This breaks the assumption which WebKit CMake build system 
+        makes in Source/cmake/WebKitHelper.cmake
+
+        * Source/cmake/OptionsBlackBerry.cmake:
+
 2012-08-08  Philippe Normand  <pnormand@igalia.com>
 
         [GStreamer] 0.11 build broken (again)
index 197d10e..48d78d8 100644 (file)
@@ -96,6 +96,11 @@ FIND_STAGING_LIBRARY(PROFILING_LIBRARY profilingS)
 FIND_STAGING_LIBRARY(LIB_INPUT_UTILITIES input_utilities)
 FIND_STAGING_LIBRARY(OTS_LIBRARY ots)
 
+# Add "-fPIC" to CMAKE_SHARED_LIBRARY_C_FLAGS and CMAKE_SHARED_LIBRARY_CXX_FLAGS
+# This is because "-fPIC" is not included in the default defines under Modules/Platform/QNX.cmake
+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC ${CMAKE_SHARED_LIBRARY_C_FLAGS}")
+SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fPIC ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
+
 # Show unresolved symbols when doing the final shared object link
 IF (PROFILING)
     SET(BLACKBERRY_LINK_FLAGS "-Wl,-z,defs -Wl,-zrelro -Wl,-E")