Title: [125121] trunk
- Revision
- 125121
- Author
- [email protected]
- Date
- 2012-08-08 17:18:01 -0700 (Wed, 08 Aug 2012)
Log Message
[BlackBerry] Fix "-fPIC" define in the BlackBerry build
https://bugs.webkit.org/show_bug.cgi?id=93548
Patch by Ming Xie <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (125120 => 125121)
--- trunk/ChangeLog 2012-08-09 00:16:38 UTC (rev 125120)
+++ trunk/ChangeLog 2012-08-09 00:18:01 UTC (rev 125121)
@@ -1,3 +1,19 @@
+2012-08-08 Ming Xie <[email protected]>
+
+ [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 <[email protected]>
[GStreamer] 0.11 build broken (again)
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (125120 => 125121)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2012-08-09 00:16:38 UTC (rev 125120)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2012-08-09 00:18:01 UTC (rev 125121)
@@ -96,6 +96,11 @@
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")
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
